CMake: preparing call to new macro SALOME_ACCUMULATE_HEADERS(). Currently disabled...

diff --git a/salome_adm/cmake_files/FindSalomeBoost.cmake b/salome_adm/cmake_files/FindSalomeBoost.cmake
index 5cbb03c41a02657a3e7eaa47e178cca557deecb7..eedb4f1c7c850b751f19e83305f3ed91065d63be 100644 (file)
--- a/salome_adm/cmake_files/FindSalomeBoost.cmake
+++ b/salome_adm/cmake_files/FindSalomeBoost.cmake
@@ -43,3 +43,5 @@ ENDIF()
 IF(WIN32)
   SET(BOOST_DEFINITIONS -DBOOST_DISABLE_ASSERTS)
 ENDIF()
+
+#SALOME_ACCUMULATE_HEADERS(Boost_INCLUDE_DIRS)

diff --git a/salome_adm/cmake_files/FindSalomeCppUnit.cmake b/salome_adm/cmake_files/FindSalomeCppUnit.cmake
index cd3c5ce4b2db0f32ea8154dddfc0ad934a4be152..4eaf46eed9bb52399a019c83b90fcecdab3f18a3 100644 (file)
--- a/salome_adm/cmake_files/FindSalomeCppUnit.cmake
+++ b/salome_adm/cmake_files/FindSalomeCppUnit.cmake
@@ -26,3 +26,5 @@
 
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(CppUnit CPPUNIT_INCLUDE_DIRS 1)
 MARK_AS_ADVANCED(CPPUNIT_INCLUDE_DIRS CPPUNIT_LIBRARIES CPPUNIT_CONFIG_BIN CPPUNIT_SUBLIB_cppunit CPPUNIT_SUBLIB_dl)
+
+#SALOME_ACCUMULATE_HEADERS(CPPUNIT_INCLUDE_DIRS)

diff --git a/salome_adm/cmake_files/FindSalomeHDF5.cmake b/salome_adm/cmake_files/FindSalomeHDF5.cmake
index 9b25dbeb298aeb0819409c4aaa8f800554ecce7c..24be3f1f5fa9b494e3a3dad64bae89e12a521050 100644 (file)
--- a/salome_adm/cmake_files/FindSalomeHDF5.cmake
+++ b/salome_adm/cmake_files/FindSalomeHDF5.cmake
@@ -42,6 +42,8 @@ IF(NOT DEFINED HDF5_LIBRARIES)
   SET(HDF5_LIBRARIES hdf5)
 ENDIF()
 
+#SALOME_ACCUMULATE_HEADERS(HDF5_INCLUDE_DIRS)
+
 ##
 ## 7. Specific to HDF5 only:
 ## Expose MPI configuration to the rest of the world

diff --git a/salome_adm/cmake_files/FindSalomeLibBatch.cmake b/salome_adm/cmake_files/FindSalomeLibBatch.cmake
index 0c78aff750d0dd09cec737a4cef69403860fd20c..6922b184fe3fbb44cbee66413e62cf282937ad3d 100644 (file)
--- a/salome_adm/cmake_files/FindSalomeLibBatch.cmake
+++ b/salome_adm/cmake_files/FindSalomeLibBatch.cmake
@@ -26,3 +26,6 @@
 
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(LibBatch LIBBATCH_ROOT_DIR_EXP 0)
 #MARK_AS_ADVANCED()
+
+#SALOME_ACCUMULATE_HEADERS(LIBBATCH_INCLUDE_DIRS)
+

diff --git a/salome_adm/cmake_files/FindSalomeLibXml2.cmake b/salome_adm/cmake_files/FindSalomeLibXml2.cmake
index a129669260538babf23e5028d621a9bb9402a219..78019255e8a261e3e0d74fdee7a3af0f56fc47ee 100644 (file)
--- a/salome_adm/cmake_files/FindSalomeLibXml2.cmake
+++ b/salome_adm/cmake_files/FindSalomeLibXml2.cmake
@@ -28,3 +28,4 @@ ELSE()
 ENDIF()
 #MARK_AS_ADVANCED()
 
+#SALOME_ACCUMULATE_HEADERS(LIBXML2_INCLUDE_DIR)

diff --git a/salome_adm/cmake_files/FindSalomeOmniORB.cmake b/salome_adm/cmake_files/FindSalomeOmniORB.cmake
index 9d8b0661d02882589299846cace54371d078131b..548475a59bf2652d21b97d5b3daddcfe33148ffa 100644 (file)
--- a/salome_adm/cmake_files/FindSalomeOmniORB.cmake
+++ b/salome_adm/cmake_files/FindSalomeOmniORB.cmake
@@ -25,3 +25,5 @@
 #
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(OmniORB OMNIORB_INCLUDE_DIR 1)
 #MARK_AS_ADVANCED()
+
+#SALOME_ACCUMULATE_HEADERS(OMNIORB_INCLUDE_DIR)
\ No newline at end of file

diff --git a/salome_adm/cmake_files/FindSalomePython.cmake b/salome_adm/cmake_files/FindSalomePython.cmake
index 7704148dec791bb16076d8ea11de7b4ec993b314..5c1f6e87c227614add82a163b6f9d8501def8cc9 100644 (file)
--- a/salome_adm/cmake_files/FindSalomePython.cmake
+++ b/salome_adm/cmake_files/FindSalomePython.cmake
@@ -173,3 +173,5 @@ ELSE()
 ENDIF()
 
 
+#SALOME_ACCUMULATE_HEADERS(PYTHON_INCLUDE_DIR)
+

diff --git a/salome_adm/cmake_files/SalomeKERNELConfig.cmake.in b/salome_adm/cmake_files/SalomeKERNELConfig.cmake.in
index cd5761cb56742c74995a555a56d247bac2f2dff5..60fa8cc39f2e4dddac6a622f2222f0672dafa441 100644 (file)
--- a/salome_adm/cmake_files/SalomeKERNELConfig.cmake.in
+++ b/salome_adm/cmake_files/SalomeKERNELConfig.cmake.in
@@ -48,6 +48,7 @@ SET_AND_CHECK(KERNEL_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@")
 
 # Include directories and definitions
 SET_AND_CHECK(KERNEL_INCLUDE_DIRS "${KERNEL_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@")
+#SET(KERNEL_INCLUDE_DIRS "${KERNEL_INCLUDE_DIRS};@_SalomeKERNEL_EXTRA_HEADERS@")
 SET(KERNEL_DEFINITIONS)
 
 #### Now the specificities

diff --git a/salome_adm/cmake_files/SalomeMacros.cmake b/salome_adm/cmake_files/SalomeMacros.cmake
index 6167a1290e05eb3dcff034f6ab1d16555656d973..a156c08b0ed5f3ecb8f1ac35ac74dc11ed95270d 100755 (executable)
--- a/salome_adm/cmake_files/SalomeMacros.cmake
+++ b/salome_adm/cmake_files/SalomeMacros.cmake
@@ -615,3 +615,20 @@ MACRO(SALOME_XVERSION pkg)
                     OUTPUT_VARIABLE ${_pkg_UC}_XVERSION)
   ENDIF()
 ENDMACRO(SALOME_XVERSION)
+
+#########################################################################
+# SALOME_ACCUMULATE_HEADERS()
+# 
+# This macro is called in the various FindSalomeXYZ.cmake modules to accumulate
+# internally the list of include headers to be saved for future export. 
+# The full set of include is saved in a variable called 
+#      _${PROJECT_NAME}_EXTRA_HEADERS
+#
+MACRO(SALOME_ACCUMULATE_HEADERS lst)
+  FOREACH(l IN LISTS ${lst})
+    LIST(FIND _${PROJECT_NAME}_EXTRA_HEADERS "${l}" _res)
+    IF(_res EQUAL "-1")
+      LIST(APPEND _${PROJECT_NAME}_EXTRA_HEADERS "${l}")
+    ENDIF()
+  ENDFOREACH()
+ENDMACRO(SALOME_ACCUMULATE_HEADERS)