bos #26458 Versioning of sources via git commit id (sha1)

[tools/configuration.git] / cmake / FindSalomeHDF5.cmake

diff --git a/cmake/FindSalomeHDF5.cmake b/cmake/FindSalomeHDF5.cmake
index 8f5d51eb131b753beca83463289ef52a8161b156..2f9dbe5923578cdcd3070d416780057e82f3f670 100644 (file)
--- a/cmake/FindSalomeHDF5.cmake
+++ b/cmake/FindSalomeHDF5.cmake
@@ -22,7 +22,7 @@
 # HDF5 detection for Salome
 #
 #  !! Please read the generic detection procedure in SalomeMacros.cmake !!
-# 
+#
 # --- HDF5 specificities ----
 #  MPI root directory used for HDF5 compilation is exposed into MPI_ROOT_DIR_EXP
 #
@@ -36,7 +36,7 @@ IF(HDF5_ROOT_DIR)
   ENDIF()
 ENDIF()
 
-SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(HDF5 HDF5_INCLUDE_DIR 1)
+FIND_PACKAGE(HDF5)
 MARK_AS_ADVANCED(FORCE HDF5_INCLUDE_DIR HDF5_LIB HDF5_DIR)
 
 # Stupidly enough, CONFIG mode and MODULE mode for HDF5 do not return the same thing ...!
@@ -50,7 +50,7 @@ IF(NOT DEFINED HDF5_LIBRARIES)
     ENDIF()
     IF(TARGET hdf5_cpp)
       SET(HDF5_CXX_LIBRARIES hdf5_cpp)
-    ELSEIF(TARGET hdf5::hdf5-shared)
+    ELSEIF(TARGET hdf5::hdf5_cpp-shared)
       SET(HDF5_CXX_LIBRARIES hdf5::hdf5_cpp-shared)
     ENDIF()
     IF(TARGET hdf5_hl)
@@ -101,7 +101,7 @@ IF(HDF5_ENABLE_PARALLEL OR HDF5_IS_PARALLEL)
   ENDFOREACH()
   IF(NOT SalomeHDF5_FIND_QUIETLY)
     MESSAGE(STATUS "HDF5 was compiled with MPI: ${MPI_ROOT_DIR_EXP}")
-  ENDIF()  
+  ENDIF()
 ENDIF()
 
 ## Add definitions
@@ -115,7 +115,7 @@ IF(HDF5_IS_PARALLEL AND NOT SALOME_USE_MPI)
    MESSAGE(FATAL_ERROR "HDF5 is compiled with MPI, you have to set SALOME_USE_MPI to ON")
 ENDIF()
 
-IF(HDF5_FOUND) 
+IF(HDF5_FOUND)
   SALOME_ACCUMULATE_HEADERS(HDF5_INCLUDE_DIRS)
   SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${HDF5_LIBRARIES})
 ENDIF()