From 780c853b9afda05be4c024a3ef3d9eb82dfba553 Mon Sep 17 00:00:00 2001 From: bruneton Date: Wed, 11 Sep 2013 08:42:29 +0000 Subject: [PATCH] CMake: Removed MPI detection: GUI only needs it as a second rank dependency (from KERNEL). KERNEL_INCLUDE_DIRS are now included in the top CMakeLists.txt --- CMakeLists.txt | 11 +++-------- adm_local/cmake_files/FindSalomeVTK.cmake | 1 + adm_local/cmake_files/SalomeGUIConfig.cmake.in | 2 +- idl/CMakeLists.txt | 1 - src/CAF/CMakeLists.txt | 1 - src/CAM/CMakeLists.txt | 1 - src/DDS/CMakeLists.txt | 1 - src/GuiHelpers/CMakeLists.txt | 1 - src/LightApp/CMakeLists.txt | 1 - src/OBJECT/CMakeLists.txt | 1 - src/OCCViewer/CMakeLists.txt | 1 - src/OpenGLUtils/CMakeLists.txt | 1 - src/SALOME_PYQT/SALOME_PYQT_GUI/CMakeLists.txt | 1 - src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt | 1 - src/SALOME_PYQT/SalomePyQt/CMakeLists.txt | 1 - src/SOCC/CMakeLists.txt | 1 - src/SVTK/CMakeLists.txt | 1 - src/SalomeApp/CMakeLists.txt | 1 - src/SalomeApp/Test/CMakeLists.txt | 1 - src/Session/CMakeLists.txt | 1 - src/TOOLSGUI/CMakeLists.txt | 1 - src/TreeData/CMakeLists.txt | 1 - src/TreeData/Test/CMakeLists.txt | 1 - src/VTKViewer/CMakeLists.txt | 1 - 24 files changed, 5 insertions(+), 30 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fef6f1335..40e9ef80a 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,6 +41,8 @@ IF(EXISTS ${KERNEL_ROOT_DIR}) LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files") INCLUDE(SalomeMacros) FIND_PACKAGE(SalomeKERNEL REQUIRED) + ADD_DEFINITIONS(${KERNEL_DEFINITIONS}) + INCLUDE_DIRECTORIES(${KERNEL_INCLUDE_DIRS}) ELSE(EXISTS ${KERNEL_ROOT_DIR}) MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR") ENDIF(EXISTS ${KERNEL_ROOT_DIR}) @@ -56,7 +58,6 @@ LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files") # User options # (some options have already been defined in KERNEL) # ============ -#OPTION(SALOME_USE_MPI "Use MPI containers" ${SALOME_USE_MPI}) OPTION(SALOME_BUILD_DOC "Generate SALOME GUI documentation" ${SALOME_BUILD_DOC}) OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ${SALOME_BUILD_TESTS}) @@ -77,7 +78,7 @@ MARK_AS_ADVANCED(SALOME_USE_PYCONSOLE SALOME_USE_QXGRAPHVIEWER) # ============= # Find "big" prerequisites first - they reference themselves many others # -> this can help finding the smaller prerequisites and detect conficts. -# In our case KERNEL has already loaded many prereq: +# In our case KERNEL has already loaded many prereq which are also used in GUI: ## ## From KERNEL: @@ -92,12 +93,6 @@ FIND_PACKAGE(SalomeBoost REQUIRED) FIND_PACKAGE(SalomeHDF5 REQUIRED COMPONENTS C) # Other KERNEL optionals: -IF(SALOME_USE_MPI) - FIND_PACKAGE(SalomeMPI REQUIRED) - IF(HDF5_IS_PARALLEL) - SALOME_ADD_MPI_TO_HDF5() - ENDIF() -ENDIF() IF(NOT SALOME_LIGHT_ONLY) FIND_PACKAGE(SalomeOmniORB REQUIRED) FIND_PACKAGE(SalomeOmniORBPy REQUIRED) diff --git a/adm_local/cmake_files/FindSalomeVTK.cmake b/adm_local/cmake_files/FindSalomeVTK.cmake index d634726fc..4338253bd 100644 --- a/adm_local/cmake_files/FindSalomeVTK.cmake +++ b/adm_local/cmake_files/FindSalomeVTK.cmake @@ -33,6 +33,7 @@ SET(SalomeVTK_FIND_COMPONENTS vtkRenderingAnnotation vtkFiltersParallel vtkIOExport + #vtkWrappingPythonCore ## ParaView 4.0.1 vtkWrappingPython ) diff --git a/adm_local/cmake_files/SalomeGUIConfig.cmake.in b/adm_local/cmake_files/SalomeGUIConfig.cmake.in index 2a9c7af5d..8987a9259 100644 --- a/adm_local/cmake_files/SalomeGUIConfig.cmake.in +++ b/adm_local/cmake_files/SalomeGUIConfig.cmake.in @@ -43,11 +43,11 @@ SET_AND_CHECK(GUI_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@") # Include directories SET_AND_CHECK(GUI_INCLUDE_DIRS "${GUI_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@") +SET(GUI_DEFINITIONS "@KERNEL_DEFINITIONS@") #### Now the specificities # Options exported by the package: -SET(SALOME_USE_MPI @SALOME_USE_MPI@) SET(SALOME_BUILD_DOC @SALOME_BUILD_DOC@) SET(SALOME_BUILD_TESTS @SALOME_BUILD_TESTS@) SET(SALOME_LIGHT_ONLY @SALOME_LIGHT_ONLY@) diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt index 38bd0204e..d2ac93c13 100755 --- a/idl/CMakeLists.txt +++ b/idl/CMakeLists.txt @@ -21,7 +21,6 @@ INCLUDE(UseOmniORB) # Provided by KERNEL INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} - ${KERNEL_INCLUDE_DIRS} ) SET(SalomeIDLGUI_IDLSOURCES diff --git a/src/CAF/CMakeLists.txt b/src/CAF/CMakeLists.txt index c7e5f8653..b77e75a0f 100755 --- a/src/CAF/CMakeLists.txt +++ b/src/CAF/CMakeLists.txt @@ -25,7 +25,6 @@ INCLUDE(UseQt4Ext) INCLUDE_DIRECTORIES( ${QT_INCLUDES} ${CAS_INCLUDE_DIRS} - ${KERNEL_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/src/Qtx ${PROJECT_SOURCE_DIR}/src/SUIT ${PROJECT_SOURCE_DIR}/src/STD diff --git a/src/CAM/CMakeLists.txt b/src/CAM/CMakeLists.txt index 00a24f948..50fba4d60 100755 --- a/src/CAM/CMakeLists.txt +++ b/src/CAM/CMakeLists.txt @@ -24,7 +24,6 @@ INCLUDE(UseQt4Ext) # additional include directories INCLUDE_DIRECTORIES( ${QT_INCLUDES} - ${KERNEL_INCLUDE_DIRS} ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/src/Qtx ${PROJECT_SOURCE_DIR}/src/SUIT diff --git a/src/DDS/CMakeLists.txt b/src/DDS/CMakeLists.txt index 735d69db9..6b4c29dea 100755 --- a/src/DDS/CMakeLists.txt +++ b/src/DDS/CMakeLists.txt @@ -25,7 +25,6 @@ # additional include directories INCLUDE_DIRECTORIES( ${CAS_INCLUDE_DIRS} - ${KERNEL_INCLUDE_DIRS} ) # additional preprocessor / compiler flags diff --git a/src/GuiHelpers/CMakeLists.txt b/src/GuiHelpers/CMakeLists.txt index 40ad7c2e0..f6b0b058c 100755 --- a/src/GuiHelpers/CMakeLists.txt +++ b/src/GuiHelpers/CMakeLists.txt @@ -24,7 +24,6 @@ INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR} - ${KERNEL_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/src/SalomeApp ${PROJECT_SOURCE_DIR}/src/LightApp ${PROJECT_SOURCE_DIR}/src/SUIT diff --git a/src/LightApp/CMakeLists.txt b/src/LightApp/CMakeLists.txt index 6aa56e96f..8a6c080b3 100755 --- a/src/LightApp/CMakeLists.txt +++ b/src/LightApp/CMakeLists.txt @@ -27,7 +27,6 @@ INCLUDE_DIRECTORIES( ${QT_INCLUDES} ${HDF5_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR} - ${KERNEL_INCLUDE_DIRS} ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/src/CAM ${PROJECT_SOURCE_DIR}/src/CASCatch diff --git a/src/OBJECT/CMakeLists.txt b/src/OBJECT/CMakeLists.txt index c0ac02c13..f4be0d7dd 100755 --- a/src/OBJECT/CMakeLists.txt +++ b/src/OBJECT/CMakeLists.txt @@ -22,7 +22,6 @@ # additional include directories INCLUDE_DIRECTORIES( ${CAS_INCLUDE_DIRS} - ${KERNEL_INCLUDE_DIRS} ) # additional preprocessor / compiler flags diff --git a/src/OCCViewer/CMakeLists.txt b/src/OCCViewer/CMakeLists.txt index 5ea8ac4ca..6e811c887 100755 --- a/src/OCCViewer/CMakeLists.txt +++ b/src/OCCViewer/CMakeLists.txt @@ -30,7 +30,6 @@ INCLUDE_DIRECTORIES( ${OGL_INCLUDE_DIRS} ${QT_INCLUDES} ${PTHREAD_INCLUDE_DIR} - ${KERNEL_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/src/CASCatch ${PROJECT_SOURCE_DIR}/src/Qtx ${PROJECT_SOURCE_DIR}/src/OpenGLUtils diff --git a/src/OpenGLUtils/CMakeLists.txt b/src/OpenGLUtils/CMakeLists.txt index 8d2aed591..08558cbef 100755 --- a/src/OpenGLUtils/CMakeLists.txt +++ b/src/OpenGLUtils/CMakeLists.txt @@ -21,7 +21,6 @@ # additional include directories INCLUDE_DIRECTORIES( - ${KERNEL_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR} ) diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/CMakeLists.txt b/src/SALOME_PYQT/SALOME_PYQT_GUI/CMakeLists.txt index 592bf2fe1..228b36692 100755 --- a/src/SALOME_PYQT/SALOME_PYQT_GUI/CMakeLists.txt +++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/CMakeLists.txt @@ -30,7 +30,6 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${KERNEL_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/src/CAM ${PROJECT_SOURCE_DIR}/src/LightApp ${PROJECT_SOURCE_DIR}/src/PyInterp diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt b/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt index b4ae6ae14..cba20143f 100755 --- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt +++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt @@ -29,7 +29,6 @@ INCLUDE_DIRECTORIES( ${SIP_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR} - ${KERNEL_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/src/CAM ${PROJECT_SOURCE_DIR}/src/Event diff --git a/src/SALOME_PYQT/SalomePyQt/CMakeLists.txt b/src/SALOME_PYQT/SalomePyQt/CMakeLists.txt index 9827dc25f..9bc8d9a01 100755 --- a/src/SALOME_PYQT/SalomePyQt/CMakeLists.txt +++ b/src/SALOME_PYQT/SalomePyQt/CMakeLists.txt @@ -30,7 +30,6 @@ INCLUDE_DIRECTORIES( ${SIP_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} - ${KERNEL_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/src/CAM ${PROJECT_SOURCE_DIR}/src/Event diff --git a/src/SOCC/CMakeLists.txt b/src/SOCC/CMakeLists.txt index 416e21d41..8bc89cefe 100755 --- a/src/SOCC/CMakeLists.txt +++ b/src/SOCC/CMakeLists.txt @@ -25,7 +25,6 @@ INCLUDE(UseQt4Ext) INCLUDE_DIRECTORIES( ${CAS_INCLUDE_DIRS} ${QT_INCLUDES} - ${KERNEL_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/src/Qtx ${PROJECT_SOURCE_DIR}/src/SUIT ${PROJECT_SOURCE_DIR}/src/OBJECT diff --git a/src/SVTK/CMakeLists.txt b/src/SVTK/CMakeLists.txt index 78796e774..3ded7f0e2 100755 --- a/src/SVTK/CMakeLists.txt +++ b/src/SVTK/CMakeLists.txt @@ -28,7 +28,6 @@ INCLUDE_DIRECTORIES( ${QT_INCLUDES} ${Boost_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR} - ${KERNEL_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/src/Qtx ${PROJECT_SOURCE_DIR}/src/SUIT ${PROJECT_SOURCE_DIR}/src/ViewerTools diff --git a/src/SalomeApp/CMakeLists.txt b/src/SalomeApp/CMakeLists.txt index 7a4e30254..f0e0d4440 100755 --- a/src/SalomeApp/CMakeLists.txt +++ b/src/SalomeApp/CMakeLists.txt @@ -36,7 +36,6 @@ INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR} - ${KERNEL_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl ${PROJECT_SOURCE_DIR}/src/CAM ${PROJECT_SOURCE_DIR}/src/CASCatch diff --git a/src/SalomeApp/Test/CMakeLists.txt b/src/SalomeApp/Test/CMakeLists.txt index ab32793f2..5ae074c85 100755 --- a/src/SalomeApp/Test/CMakeLists.txt +++ b/src/SalomeApp/Test/CMakeLists.txt @@ -22,7 +22,6 @@ # additional include directories INCLUDE_DIRECTORIES( ${CPPUNIT_INCLUDE_DIRS} - ${KERNEL_INCLUDE_DIRS} ) # additional preprocessor / compiler flags diff --git a/src/Session/CMakeLists.txt b/src/Session/CMakeLists.txt index 79f0bb84b..6b1c86a52 100755 --- a/src/Session/CMakeLists.txt +++ b/src/Session/CMakeLists.txt @@ -28,7 +28,6 @@ INCLUDE_DIRECTORIES( ${CAS_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR} - ${KERNEL_INCLUDE_DIRS} ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/src/Qtx ${PROJECT_SOURCE_DIR}/src/SUIT diff --git a/src/TOOLSGUI/CMakeLists.txt b/src/TOOLSGUI/CMakeLists.txt index bfdc98cb5..f7dd5790e 100755 --- a/src/TOOLSGUI/CMakeLists.txt +++ b/src/TOOLSGUI/CMakeLists.txt @@ -26,7 +26,6 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR} - ${KERNEL_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/src/Qtx ${PROJECT_SOURCE_DIR}/src/SUIT ) diff --git a/src/TreeData/CMakeLists.txt b/src/TreeData/CMakeLists.txt index de3901465..f41b60270 100755 --- a/src/TreeData/CMakeLists.txt +++ b/src/TreeData/CMakeLists.txt @@ -30,7 +30,6 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR} - ${KERNEL_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/src/CAM ${PROJECT_SOURCE_DIR}/src/GuiHelpers ${PROJECT_SOURCE_DIR}/src/LightApp diff --git a/src/TreeData/Test/CMakeLists.txt b/src/TreeData/Test/CMakeLists.txt index 741f24cfe..f43b24f41 100755 --- a/src/TreeData/Test/CMakeLists.txt +++ b/src/TreeData/Test/CMakeLists.txt @@ -26,7 +26,6 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} - ${KERNEL_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/src/GuiHelpers ${PROJECT_SOURCE_DIR}/src/TreeData ) diff --git a/src/VTKViewer/CMakeLists.txt b/src/VTKViewer/CMakeLists.txt index 178e1feb7..39b1d8d31 100755 --- a/src/VTKViewer/CMakeLists.txt +++ b/src/VTKViewer/CMakeLists.txt @@ -27,7 +27,6 @@ INCLUDE_DIRECTORIES( ${CAS_INCLUDE_DIRS} ${QT_INCLUDES} ${PTHREAD_INCLUDE_DIR} - ${KERNEL_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/src/Qtx ${PROJECT_SOURCE_DIR}/src/SUIT ) -- 2.39.2