Skip to content

Commit 7c161ef

Browse files
committed
use VALIDATOR in FindHDF5 for robust find-build auto-selection
1 parent 020b857 commit 7c161ef

7 files changed

Lines changed: 233 additions & 318 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ jobs:
240240

241241
strategy:
242242
matrix:
243-
cmake_version: ["3.24.4"]
243+
cmake_version: ["3.25.3"]
244244

245245
steps:
246246

.github/workflows/oneapi-linux.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ env:
55
CXX: icpx
66
FC: ifx
77
# https://github.com/oneapi-src/oneapi-ci/blob/master/.github/workflows/build_all.yml
8-
CMAKE_GENERATOR: Ninja
9-
CMAKE_INSTALL_PREFIX: ~/libs
10-
CMAKE_PREFIX_PATH: ~/libs
118

129
on:
1310
push:

CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
cmake_minimum_required(VERSION 3.24...4.3)
1+
cmake_minimum_required(VERSION 3.25...4.3)
2+
# CMake 3.25 for find_*(VALIDATE)
23
# CMake >= 3.26 required if building HDF5
34

45
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
@@ -14,6 +15,9 @@ VERSION 4.13.0
1415

1516
include(CTest)
1617

18+
# to use our FindHDF5.cmake
19+
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
20+
1721
# --- avoid Anaconda libraries
1822
if(h5fortran_python AND h5fortran_BUILD_TESTING)
1923
find_package(Python COMPONENTS Interpreter)

CMakePresets.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
"name": "default",
77
"binaryDir": "build",
88
"installDir": "${fileDir}/build/local",
9+
"generator": "Ninja",
10+
"displayName": "Default with Ninja",
911
"cacheVariables": {
1012
"h5fortran_warning_as_error": true,
1113
"h5fortran_BUILD_TESTING": true,

0 commit comments

Comments
 (0)