Skip to content

Commit

Permalink
build hdf5 corrections
Browse files Browse the repository at this point in the history
  • Loading branch information
scivision committed May 3, 2024
1 parent 5c8a340 commit db00a5b
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion cmake/hdf5.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ set(hdf5_cmake_args
-DHDF5_BUILD_FORTRAN:BOOL=true
-DHDF5_BUILD_CPP_LIB:BOOL=false
-DHDF5_BUILD_EXAMPLES:BOOL=false
-DHDF5_BUILD_TOOLS:BOOL=$<NOT:$<BOOL:${hdf5_parallel}>>
-DHDF5_BUILD_TOOLS:BOOL=$<BOOL:${hdf5_parallel}>
-DHDF5_ENABLE_PARALLEL:BOOL=$<BOOL:${hdf5_parallel}>
)
# https://github.com/HDFGroup/hdf5/issues/818 for broken ph5diff in HDF5_BUILD_TOOLS
Expand Down
4 changes: 2 additions & 2 deletions cmake/libraries.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"zlib": {
"url" : "https://github.com/zlib-ng/zlib-ng.git",
"tag": "2.1.5"
"tag": "2.1.6"
},
"hdf5": {
"url": "https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5-1_14_3.tar.gz"
"url": "https://github.com/HDFGroup/hdf5/releases/download/hdf5_1.14.4.2/hdf5-1.14.4-2.tar.gz"
}
}
1 change: 1 addition & 0 deletions cmake/zlib.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ endif()
set(zlib_cmake_args
-DZLIB_COMPAT:BOOL=on
-DZLIB_ENABLE_TESTS:BOOL=off
-DZLIBNG_ENABLE_TESTS:BOOL=off
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=on
)
# CMAKE_POSITION_INDEPENDENT_CODE=on is needed for Zlib even when using static libs.
Expand Down
7 changes: 6 additions & 1 deletion scripts/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
cmake_minimum_required(VERSION 3.20)
cmake_minimum_required(VERSION 3.20...3.30)
# https://github.com/HDFGroup/hdf5/blob/develop/CMakeLists.txt

get_property(gen_multi GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
if(NOT gen_multi AND NOT (CMAKE_BUILD_TYPE OR DEFINED ENV{CMAKE_BUILD_TYPE}))
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "")
endif()

project(HDF5_build
LANGUAGES C Fortran
)
Expand Down

0 comments on commit db00a5b

Please sign in to comment.