Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support both 5.5 and 5.6 version of ParaView
[modules/gui.git]
/
src
/
Plot2d
/
CMakeLists.txt
diff --git
a/src/Plot2d/CMakeLists.txt
b/src/Plot2d/CMakeLists.txt
index f634b7d009468614dddf66b81d4d48fa553463d0..b70709226b4b6f043716236f2d095a0cb5cdd09d 100755
(executable)
--- a/
src/Plot2d/CMakeLists.txt
+++ b/
src/Plot2d/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-17,7
+17,7
@@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-INCLUDE(UseQt
4
Ext)
+INCLUDE(UseQtExt)
# --- options ---
# --- options ---
@@
-25,24
+25,16
@@
INCLUDE(UseQt4Ext)
INCLUDE_DIRECTORIES(
${QT_INCLUDES}
${QWT_INCLUDE_DIR}
INCLUDE_DIRECTORIES(
${QT_INCLUDES}
${QWT_INCLUDE_DIR}
+ ${PYTHON_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/Qtx
${PROJECT_SOURCE_DIR}/src/SUIT
)
${PROJECT_SOURCE_DIR}/src/Qtx
${PROJECT_SOURCE_DIR}/src/SUIT
)
-IF(SALOME_USE_PYCONSOLE)
- INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS})
-ENDIF()
# additional preprocessor / compiler flags
ADD_DEFINITIONS(${QT_DEFINITIONS} ${QWT_DEFINITIONS} ${PYTHON_DEFINITIONS})
# additional preprocessor / compiler flags
ADD_DEFINITIONS(${QT_DEFINITIONS} ${QWT_DEFINITIONS} ${PYTHON_DEFINITIONS})
-IF(SALOME_USE_PYCONSOLE)
- ADD_DEFINITIONS(${PYTHON_DEFINITIONS})
-ENDIF()
# libraries to link to
# libraries to link to
-SET(_link_LIBRARIES ${QT_LIBRARIES} ${QWT_LIBRARY} qtx suit)
-IF(SALOME_USE_PYCONSOLE)
- LIST(APPEND _link_LIBRARIES ${PYTHON_LIBRARIES})
-ENDIF()
+SET(_link_LIBRARIES ${QT_LIBRARIES} ${QWT_LIBRARY} ${PYTHON_LIBRARIES} qtx suit)
# --- headers ---
# --- headers ---
@@
-59,12
+51,8
@@
SET(_moc_HEADERS
Plot2d_ViewManager.h
Plot2d_ViewModel.h
Plot2d_ViewWindow.h
Plot2d_ViewManager.h
Plot2d_ViewModel.h
Plot2d_ViewWindow.h
-)
-IF(SALOME_USE_PYCONSOLE)
- LIST(APPEND _moc_HEADERS
- Plot2d_AnalyticalCurveDlg.h
+ Plot2d_AnalyticalCurveDlg.h
)
)
-ENDIF()
# header files / no moc processing
SET(_other_HEADERS
# header files / no moc processing
SET(_other_HEADERS
@@
-74,13
+62,9
@@
SET(_other_HEADERS
Plot2d_Object.h
Plot2d_PlotItems.h
Plot2d_Prs.h
Plot2d_Object.h
Plot2d_PlotItems.h
Plot2d_Prs.h
-)
-IF(SALOME_USE_PYCONSOLE)
- LIST(APPEND _other_HEADERS
- Plot2d_AnalyticalCurve.h
- Plot2d_AnalyticalParser.h
+ Plot2d_AnalyticalCurve.h
+ Plot2d_AnalyticalParser.h
)
)
-ENDIF()
# header files / to install
SET(Plot2d_HEADERS ${_moc_HEADERS} ${_other_HEADERS})
# header files / to install
SET(Plot2d_HEADERS ${_moc_HEADERS} ${_other_HEADERS})
@@
-124,7
+108,7
@@
SET(_other_RESOURCES
# --- sources ---
# sources / moc wrappings
# --- sources ---
# sources / moc wrappings
-QT
4_WRAP_CPP
(_moc_SOURCES ${_moc_HEADERS})
+QT
_WRAP_MOC
(_moc_SOURCES ${_moc_HEADERS})
# sources / static
SET(_other_SOURCES
# sources / static
SET(_other_SOURCES
@@
-145,14
+129,10
@@
SET(_other_SOURCES
Plot2d_ViewManager.cxx
Plot2d_ViewModel.cxx
Plot2d_ViewWindow.cxx
Plot2d_ViewManager.cxx
Plot2d_ViewModel.cxx
Plot2d_ViewWindow.cxx
-)
-IF(SALOME_USE_PYCONSOLE)
- LIST(APPEND _other_SOURCES
- Plot2d_AnalyticalCurve.cxx
- Plot2d_AnalyticalCurveDlg.cxx
- Plot2d_AnalyticalParser.cxx
+ Plot2d_AnalyticalCurve.cxx
+ Plot2d_AnalyticalCurveDlg.cxx
+ Plot2d_AnalyticalParser.cxx
)
)
-ENDIF()
# sources / to compile
SET(Plot2d_SOURCES ${_other_SOURCES} ${_moc_SOURCES})
# sources / to compile
SET(Plot2d_SOURCES ${_other_SOURCES} ${_moc_SOURCES})
@@
-164,6
+144,6
@@
TARGET_LINK_LIBRARIES(Plot2d ${_link_LIBRARIES})
INSTALL(TARGETS Plot2d EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
INSTALL(FILES ${Plot2d_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
INSTALL(TARGETS Plot2d EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
INSTALL(FILES ${Plot2d_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
-QT
4
_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")
INSTALL(FILES ${_other_RESOURCES} DESTINATION ${SALOME_GUI_INSTALL_RES_DATA})
INSTALL(FILES ${_other_RESOURCES} DESTINATION ${SALOME_GUI_INSTALL_RES_DATA})