Skip to content

Commit dbfda2d

Browse files
committed
cleanup options
1 parent 6eefa5f commit dbfda2d

File tree

5 files changed

+9
-11
lines changed

5 files changed

+9
-11
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ env:
55
CTEST_NO_TESTS_ACTION: error
66
CMAKE_BUILD_PARALLEL_LEVEL: 4
77
CTEST_PARALLEL_LEVEL: 0
8+
CMAKE_INSTALL_PREFIX: ~/libs
9+
CMAKE_PREFIX_PATH: ~/libs
810

911
on:
1012
push:
@@ -73,7 +75,6 @@ jobs:
7375
run: >-
7476
cmake
7577
--preset multi
76-
--install-prefix ${{ runner.temp }}
7778
-DBUILD_SHARED_LIBS:BOOL=${{ matrix.shared }}
7879
7980
- name: Build Debug
@@ -94,7 +95,6 @@ jobs:
9495
cmake
9596
--preset default
9697
-GNinja
97-
-DCMAKE_PREFIX_PATH:PATH=${{ runner.temp }}
9898
working-directory: example
9999

100100
- name: example build

.github/workflows/ci_build.yml

+5-6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ env:
44
CMAKE_BUILD_PARALLEL_LEVEL: 4
55
CTEST_PARALLEL_LEVEL: 0
66
CTEST_NO_TESTS_ACTION: error
7+
CMAKE_INSTALL_PREFIX: ~/libs
8+
CMAKE_PREFIX_PATH: ~/libs
79

810
on:
911
push:
@@ -28,18 +30,15 @@ jobs:
2830
- uses: actions/checkout@v4
2931

3032
- name: Configure HDF5-MPI
31-
run: cmake -B build --install-prefix ${{ runner.temp }}
33+
run: cmake -B build
3234
working-directory: scripts
3335

3436
- name: Build/install HDF5
3537
run: cmake --build build
3638
working-directory: scripts
3739

3840
- name: configure h5fortran
39-
run: >-
40-
cmake --preset default
41-
--install-prefix ${{ runner.temp }}
42-
-DCMAKE_PREFIX_PATH=${{ runner.temp }}
41+
run: cmake --preset default
4342

4443
- name: build h5fortran
4544
run: cmake --build --preset default
@@ -51,7 +50,7 @@ jobs:
5150
run: cmake --install build
5251

5352
- name: configure examples
54-
run: cmake --preset default -DCMAKE_PREFIX_PATH:PATH=${{ runner.temp }}
53+
run: cmake --preset default
5554
working-directory: example
5655

5756
- name: build Examples

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.20...3.30)
1+
cmake_minimum_required(VERSION 3.21...3.30)
22

33
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
44
message(FATAL_ERROR "please use out-of-source build

cmake/ExtProj.cmake

-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ TEST_COMMAND ""
6161
CMAKE_ARGS ${cmake_args}
6262
DEPENDS ${depends}
6363
BUILD_BYPRODUCTS ${byproducts}
64-
INACTIVITY_TIMEOUT 60
6564
CONFIGURE_HANDLED_BY_BUILD true
6665
USES_TERMINAL_DOWNLOAD true
6766
USES_TERMINAL_UPDATE true

cmake/hdf5.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ set(hdf5_cmake_args
1919
-DHDF5_BUILD_FORTRAN:BOOL=true
2020
-DHDF5_BUILD_CPP_LIB:BOOL=false
2121
-DHDF5_BUILD_EXAMPLES:BOOL=false
22-
-DHDF5_BUILD_TOOLS:BOOL=$<BOOL:${hdf5_parallel}>
22+
-DHDF5_BUILD_TOOLS:BOOL=true
2323
-DHDF5_ENABLE_PARALLEL:BOOL=$<BOOL:${hdf5_parallel}>
2424
)
2525
# https://github.com/HDFGroup/hdf5/issues/818 for broken ph5diff in HDF5_BUILD_TOOLS

0 commit comments

Comments
 (0)