CMake: using SALOME_ACCUMULATE_HEADERS() to populate the complete list of includes...

+ minor bug fix in FindSalomeParMetis.cmake

diff --git a/SalomeMEDConfig.cmake.in b/SalomeMEDConfig.cmake.in
index 29a8077be476fe16751f54c08fc172c975328868..eadcd4ebd3bcc31d5bd917337847c8484118edc8 100644 (file)
--- a/SalomeMEDConfig.cmake.in
+++ b/SalomeMEDConfig.cmake.in
@@ -43,6 +43,7 @@ SET_AND_CHECK(MED_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@")
 
 # Include directories and definitions
 SET_AND_CHECK(MED_INCLUDE_DIRS "${MED_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@")
+SET(MED_INCLUDE_DIRS "${MED_INCLUDE_DIRS};@_SalomeMED_EXTRA_HEADERS@")
 SET(MED_DEFINITIONS)
 
 #### Now the specificities

diff --git a/adm_local/cmake_files/FindSalomeMetis.cmake b/adm_local/cmake_files/FindSalomeMetis.cmake
index caba241349e83991ab1d170e1dd888422e8167f0..c0b1c4045efc399bd2efd6c9c53ed1b1c60dc2e7 100644 (file)
--- a/adm_local/cmake_files/FindSalomeMetis.cmake
+++ b/adm_local/cmake_files/FindSalomeMetis.cmake
@@ -26,3 +26,5 @@
 
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(Metis METIS_INCLUDE_DIRS 1)
 #MARK_AS_ADVANCED()
+
+SALOME_ACCUMULATE_HEADERS(METIS_INCLUDE_DIRS)

diff --git a/adm_local/cmake_files/FindSalomeParMetis.cmake b/adm_local/cmake_files/FindSalomeParMetis.cmake
index f6e9d2cffc58bb892af95f653e12ca9251f5191e..b8025a5116982288c78c49df095aa6df57be714f 100644 (file)
--- a/adm_local/cmake_files/FindSalomeParMetis.cmake
+++ b/adm_local/cmake_files/FindSalomeParMetis.cmake
@@ -24,5 +24,7 @@
 #  !! Please read the generic detection procedure in SalomeMacros.cmake !!
 #
 
-SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(ParMetis METIS_ROOT_DIR_EXP 0)
+SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(ParMetis PARMETIS_INCLUDE_DIRS 1)
 #MARK_AS_ADVANCED()
+
+SALOME_ACCUMULATE_HEADERS(PARMETIS_INCLUDE_DIRS)
\ No newline at end of file

diff --git a/adm_local/cmake_files/FindSalomeScotch.cmake b/adm_local/cmake_files/FindSalomeScotch.cmake
index 09a52c5bb3ed3732eb9f4ade9b2bafd2f730f5ee..b8fd552c913d7b24c57a7ee4a7659ddda108c2ba 100644 (file)
--- a/adm_local/cmake_files/FindSalomeScotch.cmake
+++ b/adm_local/cmake_files/FindSalomeScotch.cmake
@@ -26,3 +26,5 @@
 
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(Scotch SCOTCH_INCLUDE_DIRS 1)
 #MARK_AS_ADVANCED()
+
+SALOME_ACCUMULATE_HEADERS(SCOTCH_INCLUDE_DIRS)
\ No newline at end of file