Merge branch 'V8_2_BR'

[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 3247ef9bfa52af5051f4d4268f6d7e440ca9f2e9..5c452c83f8c84aa9746d4fd650ae5a4e2b7425da 100755 (executable)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2016  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
@@ -17,8 +17,12 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UsePyQt4)
-INCLUDE(${VTK_USE_FILE})
+INCLUDE(UseQtExt)
+INCLUDE(UsePyQt)
+
+IF(SALOME_USE_VTKVIEWER)
+  INCLUDE(${VTK_USE_FILE})
+ENDIF()
 
 # --- options ---
 
@@ -35,25 +39,21 @@ 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
 )
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  "-DCALL_OLD_METHODS"
   ${QT_DEFINITIONS}
   ${CAS_DEFINITIONS}
   ${PYTHON_DEFINITIONS}
 )
-IF(SALOME_LIGHT_ONLY)
-  ADD_DEFINITIONS("-DGUI_DISABLE_CORBA")
-ENDIF()
 
 # libraries to link to
 SET(_link_LIBRARIES
@@ -93,10 +93,10 @@ SET(_sip_files SALOME_PYQT_GUILight.sip)
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 # sources / sip wrappings
-PYQT4_WRAP_SIP(_sip_SOURCES ${_sip_files})
+PYQT_WRAP_SIP(_sip_SOURCES ${_sip_files})
 
 # sources / static
 SET(_other_SOURCES