build hdf5: compatible with CMake < 3.20. Fixes #23

geospace-code · Jul 1, 2021 · 8ff15d7 · 8ff15d7
1 parent ef8bdd3
commit 8ff15d7
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 26 deletions.
diff --git a/cmake/build_hdf5.cmake b/cmake/build_hdf5.cmake
@@ -58,14 +58,23 @@ else()
   list(APPEND hdf5_cmake_args -DHDF5_ENABLE_PARALLEL:BOOL=false)
 endif()
 
-ExternalProject_Add(HDF5
-URL ${hdf5_url}
-URL_HASH SHA256=${hdf5_sha256}
-CONFIGURE_HANDLED_BY_BUILD ON
-INACTIVITY_TIMEOUT 15
-CMAKE_ARGS ${hdf5_cmake_args}
-BUILD_BYPRODUCTS ${HDF5_LIBRARIES}
-DEPENDS ZLIB)
+if(CMAKE_VERSION VERSION_LESS 3.20)
+  ExternalProject_Add(HDF5
+  URL ${hdf5_url}
+  URL_HASH SHA256=${hdf5_sha256}
+  CMAKE_ARGS ${hdf5_cmake_args}
+  BUILD_BYPRODUCTS ${HDF5_LIBRARIES}
+  DEPENDS ZLIB)
+else()
+  ExternalProject_Add(HDF5
+  URL ${hdf5_url}
+  URL_HASH SHA256=${hdf5_sha256}
+  CMAKE_ARGS ${hdf5_cmake_args}
+  BUILD_BYPRODUCTS ${HDF5_LIBRARIES}
+  DEPENDS ZLIB
+  CONFIGURE_HANDLED_BY_BUILD ON
+  INACTIVITY_TIMEOUT 15)
+endif()
 
 # --- imported target
 

diff --git a/cmake/build_zlib.cmake b/cmake/build_zlib.cmake
@@ -28,25 +28,21 @@ set(zlib_cmake_args
 -DCMAKE_BUILD_TYPE=Release
 -DCMAKE_INSTALL_PREFIX:PATH=${ZLIB_ROOT})
 
-if(zlib_git)
-ExternalProject_Add(ZLIB
-GIT_REPOSITORY ${zlib_git}
-GIT_TAG ${zlib_tag}
-CONFIGURE_HANDLED_BY_BUILD ON
-INACTIVITY_TIMEOUT 15
-CMAKE_ARGS ${zlib_cmake_args}
-BUILD_BYPRODUCTS ${ZLIB_LIBRARY}
-)
+if(CMAKE_VERSION VERSION_LESS 3.20)
+  ExternalProject_Add(ZLIB
+  URL ${zlib_url}
+  URL_HASH SHA256=${zlib_sha256}
+  CMAKE_ARGS ${zlib_cmake_args}
+  BUILD_BYPRODUCTS ${ZLIB_LIBRARY})
 else()
-ExternalProject_Add(ZLIB
-URL ${zlib_url}
-URL_HASH SHA256=${zlib_sha256}
-CONFIGURE_HANDLED_BY_BUILD ON
-INACTIVITY_TIMEOUT 15
-CMAKE_ARGS ${zlib_cmake_args}
-BUILD_BYPRODUCTS ${ZLIB_LIBRARY}
-)
-endif(zlib_git)
+  ExternalProject_Add(ZLIB
+  URL ${zlib_url}
+  URL_HASH SHA256=${zlib_sha256}
+  CMAKE_ARGS ${zlib_cmake_args}
+  BUILD_BYPRODUCTS ${ZLIB_LIBRARY}
+  CONFIGURE_HANDLED_BY_BUILD ON
+  INACTIVITY_TIMEOUT 15)
+endif()
 
 # --- imported target