X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FLightApp%2FCMakeLists.txt;h=de54a19705659c81979052dd887409832b6f64d5;hb=19cc1e04c17611f007d3534b53f940d195bbb737;hp=39daaed4b2189f5d06966bb434ae98267d34aa86;hpb=5b2495ffc3dd0f41dff19f1b6c3064c25e4c64c4;p=modules%2Fgui.git

diff --git a/src/LightApp/CMakeLists.txt b/src/LightApp/CMakeLists.txt
index 39daaed4b..de54a1970 100755
--- a/src/LightApp/CMakeLists.txt
+++ b/src/LightApp/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,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
+INCLUDE(UseQtExt)
 
 # --- options ---
 
@@ -48,6 +48,10 @@ ENDIF()
 IF(SALOME_USE_GRAPHICSVIEW)
   INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/GraphicsView)
 ENDIF()
+IF(SALOME_USE_PYVIEWER)
+  INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/PyEditor)
+  INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/PyViewer)
+ENDIF()
 IF(SALOME_USE_OCCVIEWER)
   INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/OCCViewer)
   IF(SALOME_USE_SALOMEOBJECT)
@@ -71,47 +75,25 @@ ENDIF()
 IF(SALOME_USE_QXGRAPHVIEWER)
   INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/QxScene)
 ENDIF()
+IF(SALOME_USE_PVVIEWER)
+  INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/PVViewer)
+ENDIF()
 IF(SALOME_USE_PYCONSOLE)
   INCLUDE_DIRECTORIES(
     ${PYTHON_INCLUDE_DIRS}
-    ${PROJECT_SOURCE_DIR}/src/PyConsole
-    ${PROJECT_SOURCE_DIR}/src/PyInterp
+    ${PROJECT_SOURCE_DIR}/tools/PyConsole/src
+    ${PROJECT_SOURCE_DIR}/tools/PyInterp/src
     ${PROJECT_SOURCE_DIR}/src/SUITApp
   )
 ENDIF()
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(${CAS_DEFINITIONS} ${QT_DEFINITIONS} ${HDF5_DEFINITIONS})
-IF(NOT WIN32)
-  ADD_DEFINITIONS("-Wno-deprecated")
-ENDIF()
-IF(NOT SALOME_USE_SALOMEOBJECT)
-  ADD_DEFINITIONS("-DDISABLE_SALOMEOBJECT")
-ENDIF()
-IF (NOT SALOME_USE_GLVIEWER)
-  ADD_DEFINITIONS("-DDISABLE_GLVIEWER")
-ENDIF()
-IF (NOT SALOME_USE_GRAPHICSVIEW)
-  ADD_DEFINITIONS("-DDISABLE_GRAPHICSVIEW")
-ENDIF()
-IF(NOT SALOME_USE_OCCVIEWER)
-  ADD_DEFINITIONS("-DDISABLE_OCCVIEWER")
-ENDIF()
 IF(SALOME_USE_PLOT2DVIEWER)
   ADD_DEFINITIONS(${QWT_DEFINITIONS})
-ELSE()
-  ADD_DEFINITIONS("-DDISABLE_PLOT2DVIEWER")
-ENDIF()
-IF(NOT SALOME_USE_VTKVIEWER)
-  ADD_DEFINITIONS("-DDISABLE_VTKVIEWER")
-ENDIF()
-IF(NOT SALOME_USE_QXGRAPHVIEWER)
-  ADD_DEFINITIONS("-DDISABLE_QXGRAPHVIEWER")
 ENDIF()
 IF(SALOME_USE_PYCONSOLE)
   ADD_DEFINITIONS(${PYTHON_DEFINITIONS})
-ELSE()
-  ADD_DEFINITIONS("-DDISABLE_PYCONSOLE")
 ENDIF()
 
 # libraries to link to
@@ -119,7 +101,7 @@ SET(_link_LIBRARIES
   ${CAS_KERNEL}
   ${QT_LIBRARIES}
   ${HDF5_LIBRARIES}
-  CASCatch qtx suit std SalomeStyle SalomePrs CAM LogWindow ObjBrowser 
+  CASCatch qtx suit std SalomeStyle SalomePrs CAM LogWindow ObjBrowser Event 
   ${KERNEL_SalomeHDFPersist} ${KERNEL_SALOMELocalTrace}
 )
 IF(SALOME_USE_SALOMEOBJECT)
@@ -131,6 +113,9 @@ ENDIF()
 IF(SALOME_USE_GRAPHICSVIEW)
   LIST(APPEND _link_LIBRARIES GraphicsView)
 ENDIF()
+IF(SALOME_USE_PYVIEWER)
+  LIST(APPEND _link_LIBRARIES PyEditor PyViewer)
+ENDIF()
 IF(SALOME_USE_OCCVIEWER)
   LIST(APPEND _link_LIBRARIES OCCViewer)
   IF(SALOME_USE_SALOMEOBJECT)
@@ -152,6 +137,9 @@ ENDIF()
 IF(SALOME_USE_QXGRAPHVIEWER)
   LIST(APPEND _link_LIBRARIES QxScene)
 ENDIF()
+IF(SALOME_USE_PVVIEWER)
+  LIST(APPEND _link_LIBRARIES PVViewer)
+ENDIF()
 IF(SALOME_USE_PYCONSOLE)
   LIST(APPEND _link_LIBRARIES PyInterp PyConsole SUITApp)
 ENDIF()
@@ -195,6 +183,9 @@ IF(SALOME_USE_VTKVIEWER)
     LIST(APPEND _moc_HEADERS LightApp_VTKSelector.h)
   ENDIF()
 ENDIF()
+IF(SALOME_USE_PYCONSOLE)
+  LIST(APPEND _moc_HEADERS LightApp_PyEditor.h)
+ENDIF()
 
 # header files / no moc processing
 SET(_other_HEADERS
@@ -205,14 +196,12 @@ SET(_other_HEADERS
   LightApp_Displayer.h
   LightApp_Driver.h
   LightApp_EventFilter.h
+  LightApp_FileValidator.h
   LightApp_FullScreenHelper.h
   LightApp_HDFDriver.h
   LightApp_Selection.h
   LightApp_UpdateFlags.h
 )
-IF(SALOME_USE_PYCONSOLE)
-  LIST(APPEND _other_HEADERS LightApp_PyInterp.h)
-ENDIF()
 
 # header files / to install
 SET(LightApp_HEADERS ${_moc_HEADERS} ${_other_HEADERS})
@@ -244,11 +233,11 @@ SET(_other_RESOURCES
 
 # --- sources ---
 
-# sources / rcc wrappings
-QT4_ADD_RESOURCES(_rcc_SOURCES ${_rcc_RESOURCES})
-
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
+
+# sources / rcc wrappings
+QT_ADD_RESOURCES(_rcc_SOURCES ${_rcc_RESOURCES})
 
 # sources / static
 SET(_other_SOURCES
@@ -262,6 +251,7 @@ SET(_other_SOURCES
   LightApp_Displayer.cxx
   LightApp_Driver.cxx
   LightApp_EventFilter.cxx
+  LightApp_FileValidator.cxx
   LightApp_FullScreenHelper.cxx
   LightApp_HDFDriver.cxx
   LightApp_Module.cxx
@@ -297,7 +287,7 @@ IF(SALOME_USE_VTKVIEWER)
   ENDIF()
 ENDIF()
 IF(SALOME_USE_PYCONSOLE)
-  LIST(APPEND _other_SOURCES LightApp_PyInterp.cxx)
+  LIST(APPEND _other_SOURCES LightApp_PyEditor.cxx)
 ENDIF()
 
 # sources / to compile
@@ -310,6 +300,6 @@ TARGET_LINK_LIBRARIES(LightApp ${_link_LIBRARIES})
 INSTALL(TARGETS LightApp EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 INSTALL(FILES ${LightApp_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
-QT4_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})