-# Copyright (C) 2012-2014 CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2021 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
# 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}
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)
ENDIF()
ENDIF()
IF(SALOME_USE_VTKVIEWER)
- INCLUDE_DIRECTORIES(${VTK_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/VTKViewer)
IF(SALOME_USE_SALOMEOBJECT)
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/SVTK)
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()
+ADD_DEFINITIONS(${OpenCASCADE_DEFINITIONS} ${QT_DEFINITIONS} ${HDF5_DEFINITIONS})
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
SET(_link_LIBRARIES
- ${CAS_KERNEL}
+ ${OpenCASCADE_FoundationClasses_LIBRARIES}
${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)
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)
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()
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
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})
resources/icon_module.png
resources/icon_module_big.png
resources/icon_select.png
- resources/LightApp.ini
+ resources/icon_earth.png
+ resources/icon_life_ring.png
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
LightApp_Displayer.cxx
LightApp_Driver.cxx
LightApp_EventFilter.cxx
+ LightApp_FileValidator.cxx
LightApp_FullScreenHelper.cxx
LightApp_HDFDriver.cxx
LightApp_Module.cxx
ENDIF()
ENDIF()
IF(SALOME_USE_PYCONSOLE)
- LIST(APPEND _other_SOURCES LightApp_PyInterp.cxx)
+ LIST(APPEND _other_SOURCES LightApp_PyEditor.cxx)
ENDIF()
# sources / to compile
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})