X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSALOME_PYQT%2FSalomePyQt%2FCMakeLists.txt;h=4246ca76b247f8c6c7d0426c7eca4a82e402629c;hb=949661e3432745e77dfc32ac83ee7d06c7e57ced;hp=9827dc25f5b7032de49b104c6efc3f276c15b331;hpb=6f75b0c075ffb1dc9b36df5d9b000b3b9f18ac36;p=modules%2Fgui.git

diff --git a/src/SALOME_PYQT/SalomePyQt/CMakeLists.txt b/src/SALOME_PYQT/SalomePyQt/CMakeLists.txt
index 9827dc25f..4246ca76b 100755
--- a/src/SALOME_PYQT/SalomePyQt/CMakeLists.txt
+++ b/src/SALOME_PYQT/SalomePyQt/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2014  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,7 +18,9 @@
 #
 
 INCLUDE(UsePyQt4)
-INCLUDE(${VTK_USE_FILE})
+IF(SALOME_USE_VTKVIEWER)
+  INCLUDE(${VTK_USE_FILE})
+ENDIF()
 
 # --- options ---
 
@@ -30,7 +32,6 @@ INCLUDE_DIRECTORIES(
   ${SIP_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS}
   ${PYTHON_INCLUDE_DIRS}
-  ${KERNEL_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${PROJECT_SOURCE_DIR}/src/CAM
   ${PROJECT_SOURCE_DIR}/src/Event
@@ -38,15 +39,26 @@ INCLUDE_DIRECTORIES(
   ${PROJECT_SOURCE_DIR}/src/LogWindow
   ${PROJECT_SOURCE_DIR}/src/OBJECT
   ${PROJECT_SOURCE_DIR}/src/OCCViewer
+  ${PROJECT_SOURCE_DIR}/src/PVViewer
   ${PROJECT_SOURCE_DIR}/src/ObjBrowser
   ${PROJECT_SOURCE_DIR}/src/Plot2d
   ${PROJECT_SOURCE_DIR}/src/PyInterp
+  ${PROJECT_SOURCE_DIR}/src/PyConsole
   ${PROJECT_SOURCE_DIR}/src/Qtx
   ${PROJECT_SOURCE_DIR}/src/SALOME_PYQT/SALOME_PYQT_GUILight
   ${PROJECT_SOURCE_DIR}/src/STD
   ${PROJECT_SOURCE_DIR}/src/SUIT
 )
 
+IF(SALOME_LIGHT_ONLY)
+  #disable 'ENABLE_CORBA' feature
+  SET(PYQT_SIPFLAGS ${PYQT_SIPFLAGS} "-xENABLE_CORBA;")
+ELSE(SALOME_LIGHT_ONLY)
+  INCLUDE_DIRECTORIES(
+    ${PROJECT_SOURCE_DIR}/src/SalomeApp
+  )
+ENDIF(SALOME_LIGHT_ONLY)
+
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
   ${QWT_DEFINITIONS}
@@ -54,6 +66,7 @@ ADD_DEFINITIONS(
   ${CAS_DEFINITIONS}
   ${BOOST_DEFINITIONS}
   ${PYTHON_DEFINITIONS}
+  ${OMNIORB_DEFINITIONS}
 )
 
 # libraries to link to
@@ -95,8 +108,11 @@ ADD_LIBRARY(SalomePyQt ${SalomePyQt_SOURCES})
 TARGET_LINK_LIBRARIES(SalomePyQt ${_link_LIBRARIES})
 INSTALL(TARGETS SalomePyQt DESTINATION ${SALOME_INSTALL_LIBS})
 
-IF(WINDOWS)
+IF(WIN32)
   SET_TARGET_PROPERTIES(SalomePyQt PROPERTIES SUFFIX ".pyd" DEBUG_OUTPUT_NAME SalomePyQt_d RELEASE_OUTPUT_NAME SalomePyQt)
 ELSE()
   SET_TARGET_PROPERTIES(SalomePyQt PROPERTIES PREFIX "")
 ENDIF()
+
+FILE(GLOB make_clean_files ${CMAKE_CURRENT_BINARY_DIR}/sip*)
+SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${make_clean_files}")