CMake: SALOME_PACKAGE_REPORT_AND_CHECK now works if no OPTIONAL package was specified.

[modules/kernel.git] / salome_adm / cmake_files / FindSalomeHDF5.cmake

diff --git a/salome_adm/cmake_files/FindSalomeHDF5.cmake b/salome_adm/cmake_files/FindSalomeHDF5.cmake
index 00e7301fd2d75486ef60e7781c61c5c03e15ff14..c6460a944104d631640f746eec4bc20f922dcd4f 100644 (file)
--- a/salome_adm/cmake_files/FindSalomeHDF5.cmake
+++ b/salome_adm/cmake_files/FindSalomeHDF5.cmake
@@ -27,10 +27,27 @@
 #  MPI root directory used for HDF5 compilation is exposed into MPI_ROOT_DIR_EXP
 #
 
+if(WIN32)
+  set(PREV_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+  set(CMAKE_FIND_LIBRARY_SUFFIXES dll${CMAKE_IMPORT_LIBRARY_SUFFIX})
+endif()
+
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(HDF5 HDF5_INCLUDE_DIR 1)
-MARK_AS_ADVANCED(FORCE HDF5_INCLUDE_DIR HDF5_LIB)
+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 ...!
+SET(HDF5_INCLUDE_DIRS "${HDF5_INCLUDE_DIRS};${HDF5_INCLUDE_DIR}")
+# Same story with libraries - if in CONFIG mode, HDF5_LIBRARIES is not defined:
+IF(NOT DEFINED HDF5_LIBRARIES)
+  SET(HDF5_LIBRARIES hdf5)
+ENDIF()
+
+SALOME_ACCUMULATE_HEADERS(HDF5_INCLUDE_DIRS)
 
-# 7. Expose MPI configuration to the rest of the world
+##
+## 7. Specific to HDF5 only:
+## Expose MPI configuration to the rest of the world
+##
 IF(HDF5_ENABLE_PARALLEL OR HDF5_IS_PARALLEL)
   # Set only one reference boolean variable:
   # (unfortunately what is found in /usr/share/cmake/Modules/FindHDF5.cmake
@@ -54,3 +71,17 @@ IF(HDF5_ENABLE_PARALLEL OR HDF5_IS_PARALLEL)
   ENDIF()  
 ENDIF()
 
+## Add definitions
+ADD_DEFINITIONS(-DH5_USE_16_API)
+IF(WIN32)
+  ADD_DEFINITIONS(-D_HDF5USEDLL_)
+ENDIF()
+
+## Ensure SALOME uses MPI if HDF5 was parallel:
+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(WIN32)
+  set(CMAKE_FIND_LIBRARY_SUFFIXES ${PREV_CMAKE_FIND_LIBRARY_SUFFIXES})
+endif()