From 1ae56da61c0c5f517c4960c2eb50504e1b9ba1e7 Mon Sep 17 00:00:00 2001 From: inv Date: Mon, 7 Oct 2013 17:16:29 +0000 Subject: [PATCH] Synchronize adm files --- adm_local_without_kernel/cmake_files/FindSalomeBoost.cmake | 2 +- adm_local_without_kernel/cmake_files/FindSalomeCppUnit.cmake | 2 +- adm_local_without_kernel/cmake_files/FindSalomeHDF5.cmake | 2 +- adm_local_without_kernel/cmake_files/FindSalomeLibXml2.cmake | 2 +- adm_local_without_kernel/cmake_files/FindSalomeMEDFile.cmake | 2 ++ adm_local_without_kernel/cmake_files/FindSalomeMPI.cmake | 2 ++ adm_local_without_kernel/cmake_files/FindSalomePython.cmake | 1 + adm_local_without_kernel/cmake_files/SalomeMacros.cmake | 4 +++- 8 files changed, 12 insertions(+), 5 deletions(-) diff --git a/adm_local_without_kernel/cmake_files/FindSalomeBoost.cmake b/adm_local_without_kernel/cmake_files/FindSalomeBoost.cmake index 93ba717ec..f93a88afa 100644 --- 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 4eaf46eed..e8a5527e9 100644 --- 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 24be3f1f5..c6460a944 100644 --- 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 78019255e..c736b2e63 100644 --- 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 a44420836..b53e057b5 100644 --- 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 2d0df7a84..a12c163f9 100644 --- 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 5c1f6e87c..89c4eb6fd 100644 --- 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 a156c08b0..3c3bf2d46 100755 --- 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) -- 2.39.2