From: bruneton <bruneton>
Date: Thu, 3 Oct 2013 07:22:52 +0000 (+0000)
Subject: CMake: preparing call to new macro SALOME_ACCUMULATE_HEADERS(). Currently disabled... 
X-Git-Tag: begin_agr_portmanager_branch_131004~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9f6690bfa11871fc7aeea03d6e37c6e4ed9b8f97;p=modules%2Fkernel.git

CMake: preparing call to new macro SALOME_ACCUMULATE_HEADERS(). Currently disabled (waiting for COTECH decision)
---

diff --git a/salome_adm/cmake_files/FindSalomeBoost.cmake b/salome_adm/cmake_files/FindSalomeBoost.cmake
index 5cbb03c41..eedb4f1c7 100644
--- 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 cd3c5ce4b..4eaf46eed 100644
--- 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 9b25dbeb2..24be3f1f5 100644
--- 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 0c78aff75..6922b184f 100644
--- 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 a12966926..78019255e 100644
--- 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 9d8b0661d..548475a59 100644
--- 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 7704148de..5c1f6e87c 100644
--- 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 cd5761cb5..60fa8cc39 100644
--- 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 6167a1290..a156c08b0 100755
--- 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)