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 'po/29467_gui_log_file'
[modules/gui.git]
/
src
/
LightApp
/
CMakeLists.txt
diff --git
a/src/LightApp/CMakeLists.txt
b/src/LightApp/CMakeLists.txt
old mode 100755
(executable)
new mode 100644
(file)
index
c295aa7
..
ee24141
--- a/
src/LightApp/CMakeLists.txt
+++ b/
src/LightApp/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-20
15 CEA/DEN, EDF R&D
, OPEN CASCADE
+# Copyright (C) 2012-20
23 CEA, EDF
, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-17,15
+17,16
@@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-INCLUDE(UseQt
4
Ext)
+INCLUDE(UseQtExt)
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
- ${
CAS_INCLUDE_DIRS
}
+ ${
OpenCASCADE_INCLUDE_DIR
}
${QT_INCLUDES}
${HDF5_INCLUDE_DIRS}
${QT_INCLUDES}
${HDF5_INCLUDE_DIRS}
+ ${GRAPHVIZ_INCLUDE_DIRS}
${PTHREAD_INCLUDE_DIR}
${PROJECT_BINARY_DIR}
${PROJECT_SOURCE_DIR}/src/CAM
${PTHREAD_INCLUDE_DIR}
${PROJECT_BINARY_DIR}
${PROJECT_SOURCE_DIR}/src/CAM
@@
-58,6
+59,12
@@
IF(SALOME_USE_OCCVIEWER)
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/SOCC)
ENDIF()
ENDIF()
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/SOCC)
ENDIF()
ENDIF()
+IF(SALOME_USE_PV3DVIEWER)
+ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/PV3DViewer)
+ IF(SALOME_USE_SALOMEOBJECT)
+ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/SPV3D)
+ ENDIF()
+ENDIF()
IF(SALOME_USE_PLOT2DVIEWER)
INCLUDE_DIRECTORIES(${QWT_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/Plot2d)
IF(SALOME_USE_PLOT2DVIEWER)
INCLUDE_DIRECTORIES(${QWT_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/Plot2d)
@@
-66,7
+73,6
@@
IF(SALOME_USE_PLOT2DVIEWER)
ENDIF()
ENDIF()
IF(SALOME_USE_VTKVIEWER)
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)
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/VTKViewer)
IF(SALOME_USE_SALOMEOBJECT)
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/SVTK)
@@
-81,14
+87,14
@@
ENDIF()
IF(SALOME_USE_PYCONSOLE)
INCLUDE_DIRECTORIES(
${PYTHON_INCLUDE_DIRS}
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
${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()
IF(SALOME_USE_PLOT2DVIEWER)
ADD_DEFINITIONS(${QWT_DEFINITIONS})
ENDIF()
@@
-98,12
+104,14
@@
ENDIF()
# libraries to link to
SET(_link_LIBRARIES
# libraries to link to
SET(_link_LIBRARIES
- ${
CAS_KERNEL
}
+ ${
OpenCASCADE_FoundationClasses_LIBRARIES
}
${QT_LIBRARIES}
${HDF5_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}
${KERNEL_SalomeHDFPersist} ${KERNEL_SALOMELocalTrace}
+ ${GRAPHVIZ_LIBRARIES}
)
)
+
IF(SALOME_USE_SALOMEOBJECT)
LIST(APPEND _link_LIBRARIES SalomeObject)
ENDIF()
IF(SALOME_USE_SALOMEOBJECT)
LIST(APPEND _link_LIBRARIES SalomeObject)
ENDIF()
@@
-122,6
+130,12
@@
IF(SALOME_USE_OCCVIEWER)
LIST(APPEND _link_LIBRARIES SOCC)
ENDIF()
ENDIF()
LIST(APPEND _link_LIBRARIES SOCC)
ENDIF()
ENDIF()
+IF(SALOME_USE_PV3DVIEWER)
+ LIST(APPEND _link_LIBRARIES PV3DViewer)
+ IF(SALOME_USE_SALOMEOBJECT)
+ LIST(APPEND _link_LIBRARIES SPV3D)
+ ENDIF()
+ENDIF()
IF(SALOME_USE_PLOT2DVIEWER)
LIST(APPEND _link_LIBRARIES Plot2d)
IF(SALOME_USE_SALOMEOBJECT)
IF(SALOME_USE_PLOT2DVIEWER)
LIST(APPEND _link_LIBRARIES Plot2d)
IF(SALOME_USE_SALOMEOBJECT)
@@
-147,7
+161,7
@@
ENDIF()
# --- headers ---
# header files / to be processed by moc
# --- headers ---
# header files / to be processed by moc
-SET(_moc_HEADERS
+SET(_moc_HEADERS
LightApp_AboutDlg.h
LightApp_Application.h
LightApp_DataModel.h
LightApp_AboutDlg.h
LightApp_Application.h
LightApp_DataModel.h
@@
-165,6
+179,7
@@
SET(_moc_HEADERS
LightApp_Study.h
LightApp_SwitchOp.h
LightApp_WgViewModel.h
LightApp_Study.h
LightApp_SwitchOp.h
LightApp_WgViewModel.h
+ LightApp_ExtInfoDlg.h
)
IF(SALOME_USE_GLVIEWER)
LIST(APPEND _moc_HEADERS LightApp_GLSelector.h)
)
IF(SALOME_USE_GLVIEWER)
LIST(APPEND _moc_HEADERS LightApp_GLSelector.h)
@@
-175,6
+190,11
@@
ENDIF()
IF(SALOME_USE_OCCVIEWER)
LIST(APPEND _moc_HEADERS LightApp_OCCSelector.h)
ENDIF()
IF(SALOME_USE_OCCVIEWER)
LIST(APPEND _moc_HEADERS LightApp_OCCSelector.h)
ENDIF()
+IF(SALOME_USE_PV3DVIEWER)
+ IF(SALOME_USE_SALOMEOBJECT)
+ LIST(APPEND _moc_HEADERS LightApp_PV3DSelector.h)
+ ENDIF()
+ENDIF()
IF(SALOME_USE_PLOT2DVIEWER)
LIST(APPEND _moc_HEADERS LightApp_Plot2dSelector.h)
ENDIF()
IF(SALOME_USE_PLOT2DVIEWER)
LIST(APPEND _moc_HEADERS LightApp_Plot2dSelector.h)
ENDIF()
@@
-183,6
+203,9
@@
IF(SALOME_USE_VTKVIEWER)
LIST(APPEND _moc_HEADERS LightApp_VTKSelector.h)
ENDIF()
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
# header files / no moc processing
SET(_other_HEADERS
@@
-193,14
+216,12
@@
SET(_other_HEADERS
LightApp_Displayer.h
LightApp_Driver.h
LightApp_EventFilter.h
LightApp_Displayer.h
LightApp_Driver.h
LightApp_EventFilter.h
+ LightApp_FileValidator.h
LightApp_FullScreenHelper.h
LightApp_HDFDriver.h
LightApp_Selection.h
LightApp_UpdateFlags.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})
# header files / to install
SET(LightApp_HEADERS ${_moc_HEADERS} ${_other_HEADERS})
@@
-224,19
+245,22
@@
SET(_other_RESOURCES
resources/icon_applogo.png
resources/icon_default.png
resources/icon_module.png
resources/icon_applogo.png
resources/icon_default.png
resources/icon_module.png
- resources/icon_module_big.png
resources/icon_select.png
resources/icon_select.png
- resources/LightApp.ini
+ resources/icon_earth.png
+ resources/icon_life_ring.png
+ resources/icon_add_module.png
+ resources/icon_remove_module.png
+ resources/icon_info_module.png
resources/LightApp.xml
)
# --- sources ---
resources/LightApp.xml
)
# --- sources ---
-# sources / rcc wrappings
-QT4_ADD_RESOURCES(_rcc_SOURCES ${_rcc_RESOURCES})
-
# sources / moc wrappings
# 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
# sources / static
SET(_other_SOURCES
@@
-250,6
+274,7
@@
SET(_other_SOURCES
LightApp_Displayer.cxx
LightApp_Driver.cxx
LightApp_EventFilter.cxx
LightApp_Displayer.cxx
LightApp_Driver.cxx
LightApp_EventFilter.cxx
+ LightApp_FileValidator.cxx
LightApp_FullScreenHelper.cxx
LightApp_HDFDriver.cxx
LightApp_Module.cxx
LightApp_FullScreenHelper.cxx
LightApp_HDFDriver.cxx
LightApp_Module.cxx
@@
-266,6
+291,7
@@
SET(_other_SOURCES
LightApp_Study.cxx
LightApp_SwitchOp.cxx
LightApp_WgViewModel.cxx
LightApp_Study.cxx
LightApp_SwitchOp.cxx
LightApp_WgViewModel.cxx
+ LightApp_ExtInfoDlg.cxx
)
IF(SALOME_USE_GLVIEWER)
LIST(APPEND _other_SOURCES LightApp_GLSelector.cxx)
)
IF(SALOME_USE_GLVIEWER)
LIST(APPEND _other_SOURCES LightApp_GLSelector.cxx)
@@
-276,6
+302,11
@@
ENDIF()
IF(SALOME_USE_OCCVIEWER)
LIST(APPEND _other_SOURCES LightApp_OCCSelector.cxx)
ENDIF()
IF(SALOME_USE_OCCVIEWER)
LIST(APPEND _other_SOURCES LightApp_OCCSelector.cxx)
ENDIF()
+IF(SALOME_USE_PV3DVIEWER)
+ IF(SALOME_USE_SALOMEOBJECT)
+ LIST(APPEND _other_SOURCES LightApp_PV3DSelector.cxx)
+ ENDIF()
+ENDIF()
IF(SALOME_USE_PLOT2DVIEWER)
LIST(APPEND _other_SOURCES LightApp_Plot2dSelector.cxx)
ENDIF()
IF(SALOME_USE_PLOT2DVIEWER)
LIST(APPEND _other_SOURCES LightApp_Plot2dSelector.cxx)
ENDIF()
@@
-285,7
+316,7
@@
IF(SALOME_USE_VTKVIEWER)
ENDIF()
ENDIF()
IF(SALOME_USE_PYCONSOLE)
ENDIF()
ENDIF()
IF(SALOME_USE_PYCONSOLE)
- LIST(APPEND _other_SOURCES LightApp_Py
Interp
.cxx)
+ LIST(APPEND _other_SOURCES LightApp_Py
Editor
.cxx)
ENDIF()
# sources / to compile
ENDIF()
# sources / to compile
@@
-298,6
+329,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})
INSTALL(TARGETS LightApp EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
INSTALL(FILES ${LightApp_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
-QT
4
_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})
INSTALL(FILES ${_other_RESOURCES} DESTINATION ${SALOME_GUI_INSTALL_RES_DATA})