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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fef6f1335ce3eff775f9e2235ded639965de6977..40e9ef80a2ace053d8c3cd627c1072fb4352feca 100755 (executable)
--- 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 d634726fcf6bb4319260554c78899ccb89137144..4338253bd1be405085aa19c7a9deb4c3e6b12cf5 100644 (file)
--- 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 2a9c7af5d5acb9a9079c76ebde1eda6950628320..8987a92599fec4c7374bfc1e7d6354a99965fa55 100644 (file)
--- 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 38bd0204e3986d9f942ec694b77dcb2ab6e04bdc..d2ac93c13179d280899dfc83ced7ad7be5a5f99f 100755 (executable)
--- 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 c7e5f8653fe67dee818095ab7a5e35ad28938f09..b77e75a0fe0cc17e344c4a021370006a4c1b95f8 100755 (executable)
--- 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 00a24f948f026541f7de1df6bd7b1aee7dfd52ef..50fba4d60cb9e129faf97d50d467069a60db6a2f 100755 (executable)
--- 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 735d69db93932346b164710b9610855c0ad27177..6b4c29dea3ef4937a702a7acfac362de6666b065 100755 (executable)
--- 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 40ad7c2e036e89d367e8ee035366b655234a0d3c..f6b0b058c309f0e164bd3f0cbec93512b03e54eb 100755 (executable)
--- 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 6aa56e96fc1202a4faf1a3974a1771e32b360dee..8a6c080b382917e52a8decc49b6aad5b4d7494cf 100755 (executable)
--- 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 c0ac02c133d9b0f12d1416db3481d3d046ee8422..f4be0d7dd89bb7e09bc92f9ef458e114e900a82f 100755 (executable)
--- 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 5ea8ac4cae59c334203754e36eff2e3747254a87..6e811c887643cf62a48b387ebe545f9fec6520ba 100755 (executable)
--- 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 8d2aed5915635108f091d3b284723e1479e04832..08558cbefc9e3c6a583d04cd3f332a56fcdbdf42 100755 (executable)
--- 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 592bf2fe14af48049cace050d4ddc517df075c3d..228b366922b21944b2ed74c9395d2942da81e327 100755 (executable)
--- 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 b4ae6ae14bbb87ae86797913ad8d1c39398115e4..cba20143f9fa9e9ce8f8c596cae688ba81477316 100755 (executable)
--- 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 9827dc25f5b7032de49b104c6efc3f276c15b331..9bc8d9a01d39810bbf9f34bd060c65cc03cd7137 100755 (executable)
--- 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 416e21d4141de1218f73a356b607fdd4397db317..8bc89cefec6c738787836a4f07520e811b0798c4 100755 (executable)
--- 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 78796e7745d77a292c0e2529c235e6f57ff3a347..3ded7f0e26d6fd1f771143fe57a93e13e78aa3e0 100755 (executable)
--- 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 7a4e302543411879a4af5d3e17418d83b81dce31..f0e0d444021fedb14a85f62a5a32f216a0e0876c 100755 (executable)
--- 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 ab32793f2205ab4fbb8fa360673f3d0ee3a17eda..5ae074c854df2d3b591823022baea8415bcc223b 100755 (executable)
--- 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 79f0bb84bf6bb5f69453ce7a4d4904d93b9e1528..6b1c86a52ea5876b07fdbf76fabe77dfebb19314 100755 (executable)
--- 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 bfdc98cb5a2bfbc77c3b8b03a56eea673319e946..f7dd5790eaf8aa5584bcb2e781858e08e911320a 100755 (executable)
--- 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 de39014650a14aee331d1be78388473596676560..f41b602706b49292281dc450a38c98ccdbb5617b 100755 (executable)
--- 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 741f24cfe3828a3c162983f38ce26d75f3078f0d..f43b24f418461a6f89de690fe44d38fa101e427c 100755 (executable)
--- 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 178e1feb79404f5ff0590b8358fa29191187feb2..39b1d8d3138c496e2c95b57f7b01e123c4293f4f 100755 (executable)
--- 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
 )