Skip to content

Commit 8ff15d7

Browse files
committed
build hdf5: compatible with CMake < 3.20. Fixes #23
1 parent ef8bdd3 commit 8ff15d7

File tree

2 files changed

+31
-26
lines changed

2 files changed

+31
-26
lines changed

cmake/build_hdf5.cmake

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,23 @@ else()
5858
list(APPEND hdf5_cmake_args -DHDF5_ENABLE_PARALLEL:BOOL=false)
5959
endif()
6060

61-
ExternalProject_Add(HDF5
62-
URL ${hdf5_url}
63-
URL_HASH SHA256=${hdf5_sha256}
64-
CONFIGURE_HANDLED_BY_BUILD ON
65-
INACTIVITY_TIMEOUT 15
66-
CMAKE_ARGS ${hdf5_cmake_args}
67-
BUILD_BYPRODUCTS ${HDF5_LIBRARIES}
68-
DEPENDS ZLIB)
61+
if(CMAKE_VERSION VERSION_LESS 3.20)
62+
ExternalProject_Add(HDF5
63+
URL ${hdf5_url}
64+
URL_HASH SHA256=${hdf5_sha256}
65+
CMAKE_ARGS ${hdf5_cmake_args}
66+
BUILD_BYPRODUCTS ${HDF5_LIBRARIES}
67+
DEPENDS ZLIB)
68+
else()
69+
ExternalProject_Add(HDF5
70+
URL ${hdf5_url}
71+
URL_HASH SHA256=${hdf5_sha256}
72+
CMAKE_ARGS ${hdf5_cmake_args}
73+
BUILD_BYPRODUCTS ${HDF5_LIBRARIES}
74+
DEPENDS ZLIB
75+
CONFIGURE_HANDLED_BY_BUILD ON
76+
INACTIVITY_TIMEOUT 15)
77+
endif()
6978

7079
# --- imported target
7180

cmake/build_zlib.cmake

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,21 @@ set(zlib_cmake_args
2828
-DCMAKE_BUILD_TYPE=Release
2929
-DCMAKE_INSTALL_PREFIX:PATH=${ZLIB_ROOT})
3030

31-
if(zlib_git)
32-
ExternalProject_Add(ZLIB
33-
GIT_REPOSITORY ${zlib_git}
34-
GIT_TAG ${zlib_tag}
35-
CONFIGURE_HANDLED_BY_BUILD ON
36-
INACTIVITY_TIMEOUT 15
37-
CMAKE_ARGS ${zlib_cmake_args}
38-
BUILD_BYPRODUCTS ${ZLIB_LIBRARY}
39-
)
31+
if(CMAKE_VERSION VERSION_LESS 3.20)
32+
ExternalProject_Add(ZLIB
33+
URL ${zlib_url}
34+
URL_HASH SHA256=${zlib_sha256}
35+
CMAKE_ARGS ${zlib_cmake_args}
36+
BUILD_BYPRODUCTS ${ZLIB_LIBRARY})
4037
else()
41-
ExternalProject_Add(ZLIB
42-
URL ${zlib_url}
43-
URL_HASH SHA256=${zlib_sha256}
44-
CONFIGURE_HANDLED_BY_BUILD ON
45-
INACTIVITY_TIMEOUT 15
46-
CMAKE_ARGS ${zlib_cmake_args}
47-
BUILD_BYPRODUCTS ${ZLIB_LIBRARY}
48-
)
49-
endif(zlib_git)
38+
ExternalProject_Add(ZLIB
39+
URL ${zlib_url}
40+
URL_HASH SHA256=${zlib_sha256}
41+
CMAKE_ARGS ${zlib_cmake_args}
42+
BUILD_BYPRODUCTS ${ZLIB_LIBRARY}
43+
CONFIGURE_HANDLED_BY_BUILD ON
44+
INACTIVITY_TIMEOUT 15)
45+
endif()
5046

5147
# --- imported target
5248

0 commit comments

Comments
 (0)