]>
Commit | Line | Data |
---|---|---|
1e59de90 TL |
1 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
2 | index 46446da8a..cd05cf51a 100644 | |
3 | --- a/CMakeLists.txt | |
4 | +++ b/CMakeLists.txt | |
5 | @@ -219,20 +221,10 @@ if (CGNS_ENABLE_HDF5) | |
6 | endif (HDF5_FOUND) | |
7 | ||
8 | set(HDF5_NEED_ZLIB "OFF" CACHE BOOL "Does the HDF5 library require linking to zlib?") | |
9 | - if(HDF5_NEED_ZLIB) | |
10 | - find_library(ZLIB_LIBRARY z) | |
11 | - mark_as_advanced(CLEAR ZLIB_LIBRARY) | |
12 | - else (HDF5_NEED_ZLIB) | |
13 | - mark_as_advanced(FORCE ZLIB_LIBRARY) | |
14 | - endif(HDF5_NEED_ZLIB) | |
15 | + set(HDF5_NEED_ZLIB ${HDF5_ENABLE_Z_LIB_SUPPORT} CACHE INTERNAL "" FORCE) | |
16 | ||
17 | set(HDF5_NEED_SZIP "OFF" CACHE BOOL "Does the HDF5 library require linking to zlib?") | |
18 | - if (HDF5_NEED_SZIP) | |
19 | - find_library(SZIP_LIBRARY szip) | |
20 | - mark_as_advanced(CLEAR SZIP_LIBRARY) | |
21 | - else (HDF5_NEED_SZIP) | |
22 | - mark_as_advanced(FORCE SZIP_LIBRARY) | |
23 | - endif (HDF5_NEED_SZIP) | |
24 | + set(HDF5_NEED_SZIP ${HDF5_ENABLE_SZIP_SUPPORT} CACHE INTERNAL "" FORCE) | |
25 | ||
26 | # Check if HDF5 version is 1.8 or greater | |
27 | if (HDF5_VERSION VERSION_LESS "1.8.0") | |
28 | @@ -240,6 +231,7 @@ if (CGNS_ENABLE_HDF5) | |
29 | endif (HDF5_VERSION VERSION_LESS "1.8.0") | |
30 | ||
31 | set(HDF5_NEED_MPI "OFF" CACHE BOOL "Does the HDF5 library require linking to mpi? (Only true if using parallel HDF5)") | |
32 | + set(HDF5_NEED_MPI ${HDF5_ENABLE_PARALLEL} CACHE INTERNAL "" FORCE) | |
33 | set(MPI_INC) | |
34 | set(MPI_LIBS) | |
35 | if (HDF5_NEED_MPI) |