Redesign SALOME documentation

[modules/gui.git] / src / LightApp / CMakeLists.txt

diff --git a/src/LightApp/CMakeLists.txt b/src/LightApp/CMakeLists.txt
index 165ede976b988cb44258f63e231efdac5241ee4f..41e4fbb78b7dd8aa5bd6671c10f350f44e24ce45 100755 (executable)
--- a/src/LightApp/CMakeLists.txt
+++ b/src/LightApp/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  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
@@ -17,13 +17,13 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
+INCLUDE(UseQtExt)
 
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${QT_INCLUDES}
   ${HDF5_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
@@ -81,15 +81,14 @@ ENDIF()
 IF(SALOME_USE_PYCONSOLE)
   INCLUDE_DIRECTORIES(
     ${PYTHON_INCLUDE_DIRS}
-    ${PROJECT_SOURCE_DIR}/src/SalomePyConsole
-    ${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})
+ADD_DEFINITIONS(${OpenCASCADE_DEFINITIONS} ${QT_DEFINITIONS} ${HDF5_DEFINITIONS})
 IF(SALOME_USE_PLOT2DVIEWER)
   ADD_DEFINITIONS(${QWT_DEFINITIONS})
 ENDIF()
@@ -99,7 +98,7 @@ ENDIF()
 
 # libraries to link to
 SET(_link_LIBRARIES
-  ${CAS_KERNEL}
+  ${OpenCASCADE_FoundationClasses_LIBRARIES}
   ${QT_LIBRARIES}
   ${HDF5_LIBRARIES}
   CASCatch qtx suit std SalomeStyle SalomePrs CAM LogWindow ObjBrowser Event 
@@ -142,7 +141,7 @@ IF(SALOME_USE_PVVIEWER)
   LIST(APPEND _link_LIBRARIES PVViewer)
 ENDIF()
 IF(SALOME_USE_PYCONSOLE)
-  LIST(APPEND _link_LIBRARIES PyInterp SalomePyConsole SUITApp)
+  LIST(APPEND _link_LIBRARIES PyInterp PyConsole SUITApp)
 ENDIF()
 
 # --- headers ---
@@ -184,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
@@ -194,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})
@@ -227,17 +227,19 @@ SET(_other_RESOURCES
   resources/icon_module.png
   resources/icon_module_big.png
   resources/icon_select.png
+  resources/icon_earth.png
+  resources/icon_life_ring.png
   resources/LightApp.ini
   resources/LightApp.xml
 )
 
 # --- 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
@@ -251,6 +253,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
@@ -286,7 +289,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
@@ -299,6 +302,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})