Synchronize adm files

diff --git a/adm_local_without_kernel/cmake_files/FindSalomeBoost.cmake b/adm_local_without_kernel/cmake_files/FindSalomeBoost.cmake
index 93ba717ec7ecbda59e68853549030a95a9ffec1c..f93a88afa5550f8fa0f95a4f4eb5669821c0f5e8 100644 (file)
--- a/adm_local_without_kernel/cmake_files/FindSalomeBoost.cmake
+++ b/adm_local_without_kernel/cmake_files/FindSalomeBoost.cmake
@@ -45,4 +45,4 @@ IF(WIN32)
   SET(BOOST_DEFINITIONS -DBOOST_DISABLE_ASSERTS)
 ENDIF()
 
-#SALOME_ACCUMULATE_HEADERS(Boost_INCLUDE_DIRS)
+SALOME_ACCUMULATE_HEADERS(Boost_INCLUDE_DIRS)

diff --git a/adm_local_without_kernel/cmake_files/FindSalomeCppUnit.cmake b/adm_local_without_kernel/cmake_files/FindSalomeCppUnit.cmake
index 4eaf46eed9bb52399a019c83b90fcecdab3f18a3..e8a5527e9c8c3f77cdee84b7d51d75dffa874b31 100644 (file)
--- a/adm_local_without_kernel/cmake_files/FindSalomeCppUnit.cmake
+++ b/adm_local_without_kernel/cmake_files/FindSalomeCppUnit.cmake
@@ -27,4 +27,4 @@
 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)
+SALOME_ACCUMULATE_HEADERS(CPPUNIT_INCLUDE_DIRS)

diff --git a/adm_local_without_kernel/cmake_files/FindSalomeHDF5.cmake b/adm_local_without_kernel/cmake_files/FindSalomeHDF5.cmake
index 24be3f1f5fa9b494e3a3dad64bae89e12a521050..c6460a944104d631640f746eec4bc20f922dcd4f 100644 (file)
--- a/adm_local_without_kernel/cmake_files/FindSalomeHDF5.cmake
+++ b/adm_local_without_kernel/cmake_files/FindSalomeHDF5.cmake
@@ -42,7 +42,7 @@ IF(NOT DEFINED HDF5_LIBRARIES)
   SET(HDF5_LIBRARIES hdf5)
 ENDIF()
 
-#SALOME_ACCUMULATE_HEADERS(HDF5_INCLUDE_DIRS)
+SALOME_ACCUMULATE_HEADERS(HDF5_INCLUDE_DIRS)
 
 ##
 ## 7. Specific to HDF5 only:

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

diff --git a/adm_local_without_kernel/cmake_files/FindSalomeMEDFile.cmake b/adm_local_without_kernel/cmake_files/FindSalomeMEDFile.cmake
index a4442083631cdfff04f2f1f098856f882a3f74c7..b53e057b5fa91e49c5af95d2e8eaa3ce7eea7645 100644 (file)
--- a/adm_local_without_kernel/cmake_files/FindSalomeMEDFile.cmake
+++ b/adm_local_without_kernel/cmake_files/FindSalomeMEDFile.cmake
@@ -26,3 +26,5 @@
 
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(MEDFile MEDFILE_INCLUDE_DIRS 1)
 #MARK_AS_ADVANCED()
+
+SALOME_ACCUMULATE_HEADERS(MEDFILE_INCLUDE_DIRS)
\ No newline at end of file

diff --git a/adm_local_without_kernel/cmake_files/FindSalomeMPI.cmake b/adm_local_without_kernel/cmake_files/FindSalomeMPI.cmake
index 2d0df7a84c370e1dff8618ad826f00b250e3fee1..a12c163f92c93f17ba505186431c97acb42d2e12 100644 (file)
--- a/adm_local_without_kernel/cmake_files/FindSalomeMPI.cmake
+++ b/adm_local_without_kernel/cmake_files/FindSalomeMPI.cmake
@@ -29,3 +29,5 @@ MARK_AS_ADVANCED(MPI_EXTRA_LIBRARY MPI_LIBRARY)
 
 SET(MPI_INCLUDE_DIRS ${MPI_C_INCLUDE_PATH} ${MPI_CXX_INCLUDE_PATH})
 SET(MPI_LIBRARIES ${MPI_C_LIBRARIES} ${MPI_CXX_LIBRARIES})
+
+SALOME_ACCUMULATE_HEADERS(MPI_INCLUDE_DIRS)

diff --git a/adm_local_without_kernel/cmake_files/FindSalomePython.cmake b/adm_local_without_kernel/cmake_files/FindSalomePython.cmake
index 5c1f6e87c227614add82a163b6f9d8501def8cc9..89c4eb6fd1a01b3608f43764b07e887d3a5a11a6 100644 (file)
--- a/adm_local_without_kernel/cmake_files/FindSalomePython.cmake
+++ b/adm_local_without_kernel/cmake_files/FindSalomePython.cmake
@@ -150,6 +150,7 @@ IF (SALOMEPYTHON_FOUND)
   ## 6. Save the final detected installation
   ##
   SET(PYTHON_ROOT_DIR "${_tmp_ROOT_DIR}")
+  SALOME_ACCUMULATE_HEADERS(PYTHON_INCLUDE_DIR)
 
   ## 7. Specifics
   ##

diff --git a/adm_local_without_kernel/cmake_files/SalomeMacros.cmake b/adm_local_without_kernel/cmake_files/SalomeMacros.cmake
index a156c08b0ed5f3ecb8f1ac35ac74dc11ed95270d..3c3bf2d46c29402b103d2032e30a72a1b857e551 100755 (executable)
--- a/adm_local_without_kernel/cmake_files/SalomeMacros.cmake
+++ b/adm_local_without_kernel/cmake_files/SalomeMacros.cmake
@@ -628,7 +628,9 @@ 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}")
+      IF(NOT "${l}" STREQUAL "/usr/include")
+        LIST(APPEND _${PROJECT_NAME}_EXTRA_HEADERS "${l}")
+      ENDIF()
     ENDIF()
   ENDFOREACH()
 ENDMACRO(SALOME_ACCUMULATE_HEADERS)