Merge remote-tracking branch 'origin/master'

[modules/gui.git] / src / SALOME_PYQT / SALOME_PYQT_GUILight / CMakeLists.txt

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt b/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt
index ec02263954a7a38bba97fd31e004204dc987d0c8..8474c52a52d089dcd7f9aa4184092b3164596cb3 100755 (executable)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt
@@ -28,10 +28,10 @@ ENDIF()
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${QT_INCLUDES}
-  ${SIP_INCLUDE_DIR}
   ${PYTHON_INCLUDE_DIRS}
+  ${SIP_INCLUDE_DIR}
   ${PTHREAD_INCLUDE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${PROJECT_SOURCE_DIR}/src/CAM
@@ -39,19 +39,22 @@ INCLUDE_DIRECTORIES(
   ${PROJECT_SOURCE_DIR}/src/LightApp
   ${PROJECT_SOURCE_DIR}/src/OCCViewer
   ${PROJECT_SOURCE_DIR}/src/Plot2d
-  ${PROJECT_SOURCE_DIR}/src/PyConsole
-  ${PROJECT_SOURCE_DIR}/src/PyInterp
   ${PROJECT_SOURCE_DIR}/src/Qtx
   ${PROJECT_SOURCE_DIR}/src/STD
   ${PROJECT_SOURCE_DIR}/src/SUIT
   ${PROJECT_SOURCE_DIR}/src/SUITApp
   ${PROJECT_SOURCE_DIR}/src/ObjBrowser
+  ${PROJECT_SOURCE_DIR}/tools/PyConsole/src
+  ${PROJECT_SOURCE_DIR}/tools/PyInterp/src
 )
+IF(SALOME_USE_SALOMEOBJECT)
+  INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/OBJECT)
+ENDIF()
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
   ${QT_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${PYTHON_DEFINITIONS}
 )
 
@@ -73,11 +76,13 @@ SET(_moc_HEADERS
   SALOME_PYQT_DataModelLight.h
   SALOME_PYQT_ModuleLight.h
   SALOME_PYQT_PyModule.h
+  SALOME_PYQT_Selector.h
 )
 
 # header files / no moc processing
 SET(_other_HEADERS
   SALOME_PYQT_DataObjectLight.h
+  SALOME_PYQT_BorrowedDataObjectLight.h
   SALOME_PYQT_GUILight.h
   SALOME_PYQT_PyInterp.h
 )
@@ -102,9 +107,11 @@ PYQT_WRAP_SIP(_sip_SOURCES ${_sip_files})
 SET(_other_SOURCES
   SALOME_PYQT_DataModelLight.cxx
   SALOME_PYQT_DataObjectLight.cxx
+  SALOME_PYQT_BorrowedDataObjectLight.cxx
   SALOME_PYQT_ModuleLight.cxx
   SALOME_PYQT_PyInterp.cxx
   SALOME_PYQT_PyModule.cxx
+  SALOME_PYQT_Selector.cxx
 )
 
 # sources / to compile