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
Merge branch 'master' into abn/paravis_rearch
[modules/gui.git]
/
src
/
SALOME_PYQT
/
SalomePyQt
/
CMakeLists.txt
diff --git
a/src/SALOME_PYQT/SalomePyQt/CMakeLists.txt
b/src/SALOME_PYQT/SalomePyQt/CMakeLists.txt
index 04c44a1281887f4278e375da353a6681fd457bea..4246ca76b247f8c6c7d0426c7eca4a82e402629c 100755
(executable)
--- a/
src/SALOME_PYQT/SalomePyQt/CMakeLists.txt
+++ b/
src/SALOME_PYQT/SalomePyQt/CMakeLists.txt
@@
-1,9
+1,9
@@
-# Copyright (C) 2012-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-201
4
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
#
# 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
#
# 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(UsePyQt4)
-INCLUDE(${VTK_USE_FILE})
+IF(SALOME_USE_VTKVIEWER)
+ INCLUDE(${VTK_USE_FILE})
+ENDIF()
# --- options ---
# --- options ---
@@
-37,15
+39,26
@@
INCLUDE_DIRECTORIES(
${PROJECT_SOURCE_DIR}/src/LogWindow
${PROJECT_SOURCE_DIR}/src/OBJECT
${PROJECT_SOURCE_DIR}/src/OCCViewer
${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/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
)
${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}
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
${QWT_DEFINITIONS}
@@
-53,6
+66,7
@@
ADD_DEFINITIONS(
${CAS_DEFINITIONS}
${BOOST_DEFINITIONS}
${PYTHON_DEFINITIONS}
${CAS_DEFINITIONS}
${BOOST_DEFINITIONS}
${PYTHON_DEFINITIONS}
+ ${OMNIORB_DEFINITIONS}
)
# libraries to link to
)
# libraries to link to