cleanup options

geospace-code · May 10, 2024 · dbfda2d · dbfda2d
1 parent 6eefa5f
commit dbfda2d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,6 +5,8 @@ env:
   CTEST_NO_TESTS_ACTION: error
   CMAKE_BUILD_PARALLEL_LEVEL: 4
   CTEST_PARALLEL_LEVEL: 0
+  CMAKE_INSTALL_PREFIX: ~/libs
+  CMAKE_PREFIX_PATH: ~/libs
 
 on:
   push:
@@ -73,7 +75,6 @@ jobs:
       run: >-
         cmake
         --preset multi
-        --install-prefix ${{ runner.temp }}
         -DBUILD_SHARED_LIBS:BOOL=${{ matrix.shared }}
 
     - name: Build Debug
@@ -94,7 +95,6 @@ jobs:
         cmake
         --preset default
         -GNinja
-        -DCMAKE_PREFIX_PATH:PATH=${{ runner.temp }}
       working-directory: example
 
     - name: example build

diff --git a/.github/workflows/ci_build.yml b/.github/workflows/ci_build.yml
@@ -4,6 +4,8 @@ env:
    CMAKE_BUILD_PARALLEL_LEVEL: 4
    CTEST_PARALLEL_LEVEL: 0
    CTEST_NO_TESTS_ACTION: error
+   CMAKE_INSTALL_PREFIX: ~/libs
+   CMAKE_PREFIX_PATH: ~/libs
 
 on:
   push:
@@ -28,18 +30,15 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Configure HDF5-MPI
-      run: cmake -B build --install-prefix ${{ runner.temp }}
+      run: cmake -B build
       working-directory: scripts
 
     - name: Build/install HDF5
       run: cmake --build build
       working-directory: scripts
 
     - name: configure h5fortran
-      run: >-
-        cmake --preset default
-        --install-prefix ${{ runner.temp }}
-        -DCMAKE_PREFIX_PATH=${{ runner.temp }}
+      run: cmake --preset default
 
     - name: build h5fortran
       run: cmake --build --preset default
@@ -51,7 +50,7 @@ jobs:
       run: cmake --install build
 
     - name: configure examples
-      run: cmake --preset default -DCMAKE_PREFIX_PATH:PATH=${{ runner.temp }}
+      run: cmake --preset default
       working-directory: example
 
     - name: build Examples

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20...3.30)
+cmake_minimum_required(VERSION 3.21...3.30)
 
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
   message(FATAL_ERROR "please use out-of-source build

diff --git a/cmake/ExtProj.cmake b/cmake/ExtProj.cmake
@@ -61,7 +61,6 @@ TEST_COMMAND ""
 CMAKE_ARGS ${cmake_args}
 DEPENDS ${depends}
 BUILD_BYPRODUCTS ${byproducts}
-INACTIVITY_TIMEOUT 60
 CONFIGURE_HANDLED_BY_BUILD true
 USES_TERMINAL_DOWNLOAD true
 USES_TERMINAL_UPDATE true

diff --git a/cmake/hdf5.cmake b/cmake/hdf5.cmake
@@ -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=$<BOOL:${hdf5_parallel}>
+-DHDF5_BUILD_TOOLS:BOOL=true
 -DHDF5_ENABLE_PARALLEL:BOOL=$<BOOL:${hdf5_parallel}>
 )
 # https://github.com/HDFGroup/hdf5/issues/818  for broken ph5diff in HDF5_BUILD_TOOLS