From: bruneton <bruneton>
Date: Mon, 7 Oct 2013 07:44:07 +0000 (+0000)
Subject: CMake: using SALOME_ACCUMULATE_HEADERS() to populate the complete list of includes... 
X-Git-Tag: V7_3_0a1~109
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d2fb7685e7832a92502060551c1a212335beb27c;p=modules%2Fmed.git

CMake: using SALOME_ACCUMULATE_HEADERS() to populate the complete list of includes required by KERNEL header files.
+ minor bug fix in FindSalomeParMetis.cmake
---

diff --git a/SalomeMEDConfig.cmake.in b/SalomeMEDConfig.cmake.in
index 29a8077be..eadcd4ebd 100644
--- 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 caba24134..c0b1c4045 100644
--- 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 f6e9d2cff..b8025a511 100644
--- 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 09a52c5bb..b8fd552c9 100644
--- 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