Patch from Intel

diff --git a/cmake/FindSalomeHDF5.cmake b/cmake/FindSalomeHDF5.cmake
index 271a585f64097290c8b2d84e695d1d61e732d02a..1a4b27e4ab5728e1778762c3fe928f73b71837be 100644 (file)
--- a/cmake/FindSalomeHDF5.cmake
+++ b/cmake/FindSalomeHDF5.cmake
@@ -72,7 +72,7 @@ IF(HDF5_ENABLE_PARALLEL OR HDF5_IS_PARALLEL)
     SET(_suffix "-shared")
     SET(HDF5_LIBRARIES "${_target_prefix}hdf5${_suffix}")
   ENDIF()
-  GET_PROPERTY(_lib_lst TARGET ${HDF5_LIBRARIES} PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG)
+  GET_PROPERTY(_lib_lst SOURCE ${HDF5_LIBRARIES} PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG)
   FOREACH(s ${_lib_lst})
     STRING(FIND "${s}" "mpi." _res)   # should cover WIN(?) and LINUX
     IF(_res GREATER -1)

diff --git a/cmake/FindSalomeMEDFile.cmake b/cmake/FindSalomeMEDFile.cmake
index 8ea30eae18e02281d0ea1390c2eb630903b13f83..750f0de78d245016fcbfd958c1828ef0f7c3638e 100644 (file)
--- a/cmake/FindSalomeMEDFile.cmake
+++ b/cmake/FindSalomeMEDFile.cmake
@@ -39,8 +39,8 @@ IF(MEDFile_FOUND)
   TRY_RUN(_med_int_run_result _med_int_compile_results
           ${CMAKE_BINARY_DIR} ${_med_int_cxx}
           CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${MEDFILE_INCLUDE_DIRS};${HDF5_INCLUDE_DIR}"
-          LINK_LIBRARIES ${MEDFILE_C_LIBRARIES}
-          RUN_OUTPUT_VARIABLE _med_int_output)
+         LINK_LIBRARIES ${MEDFILE_C_LIBRARIES} ${HDF5_LIBRARIES}
+         RUN_OUTPUT_VARIABLE _med_int_output)
   IF(_med_int_compile_results)
     SET(MED_INT_SIZE ${_med_int_output})
   ELSE()

diff --git a/cmake/FindSalomeParMetis.cmake b/cmake/FindSalomeParMetis.cmake
index 617d6c981da3d72009775b15acc52ac668529968..19dd8ed79cd5807319c5c322e749e3b379ce6378 100644 (file)
--- a/cmake/FindSalomeParMetis.cmake
+++ b/cmake/FindSalomeParMetis.cmake
@@ -24,10 +24,10 @@
 #  !! Please read the generic detection procedure in SalomeMacros.cmake !!
 #
 
-SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(ParMetis PARMETIS_INCLUDE_DIRS 0)
+SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(ParMetis PARMETIS_INCLUDE_DIRS 1)
 #MARK_AS_ADVANCED()
 
 IF(PARMETIS_FOUND)
   SALOME_ACCUMULATE_HEADERS(PARMETIS_INCLUDE_DIRS)
   SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${PARMETIS_LIBRARIES})
-ENDIF()
\ No newline at end of file
+ENDIF()