diff options
| author | jhendersonHDF <jhenderson@hdfgroup.org> | 2024-03-07 16:03:13 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-07 16:03:13 (GMT) |
| commit | 2a2c683dc3f2d1accedc3dc4d8596d7988154acd (patch) | |
| tree | a5c19a5a458f51f62ee78496087b0e42ed67c24b /.github | |
| parent | 9d8e8824964af3137b9e4cd400b9b45304fd86ef (diff) | |
| download | hdf5-2a2c683dc3f2d1accedc3dc4d8596d7988154acd.zip hdf5-2a2c683dc3f2d1accedc3dc4d8596d7988154acd.tar.gz hdf5-2a2c683dc3f2d1accedc3dc4d8596d7988154acd.tar.bz2 | |
Don't load toolchain file in CMake workflows (#4077)
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/main-cmake-spc.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/main-cmake.yml | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/.github/workflows/main-cmake-spc.yml b/.github/workflows/main-cmake-spc.yml index 9531035..fd14b01 100644 --- a/.github/workflows/main-cmake-spc.yml +++ b/.github/workflows/main-cmake-spc.yml @@ -48,7 +48,6 @@ jobs: cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake \ -G Ninja \ -DCMAKE_BUILD_TYPE=Debug \ - -DCMAKE_TOOLCHAIN_FILE=config/toolchain/gcc.cmake \ -DBUILD_SHARED_LIBS=ON \ -DHDF5_ENABLE_ALL_WARNINGS=ON \ -DHDF5_ENABLE_PARALLEL:BOOL=OFF \ @@ -109,7 +108,6 @@ jobs: cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake \ -G Ninja \ -DCMAKE_BUILD_TYPE=Debug \ - -DCMAKE_TOOLCHAIN_FILE=config/toolchain/gcc.cmake \ -DBUILD_SHARED_LIBS=ON \ -DHDF5_ENABLE_ALL_WARNINGS=ON \ -DHDF5_ENABLE_PARALLEL:BOOL=OFF \ @@ -170,7 +168,6 @@ jobs: cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake \ -G Ninja \ -DCMAKE_BUILD_TYPE=Debug \ - -DCMAKE_TOOLCHAIN_FILE=config/toolchain/gcc.cmake \ -DBUILD_SHARED_LIBS=ON \ -DHDF5_ENABLE_ALL_WARNINGS=ON \ -DHDF5_ENABLE_PARALLEL:BOOL=OFF \ @@ -231,7 +228,6 @@ jobs: cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake \ -G Ninja \ -DCMAKE_BUILD_TYPE=Debug \ - -DCMAKE_TOOLCHAIN_FILE=config/toolchain/gcc.cmake \ -DBUILD_SHARED_LIBS=ON \ -DHDF5_ENABLE_ALL_WARNINGS=ON \ -DHDF5_ENABLE_PARALLEL:BOOL=OFF \ diff --git a/.github/workflows/main-cmake.yml b/.github/workflows/main-cmake.yml index 14e1eff..ec93d0d 100644 --- a/.github/workflows/main-cmake.yml +++ b/.github/workflows/main-cmake.yml @@ -49,7 +49,6 @@ jobs: # No Fortran, parallel, or VFDs that rely on POSIX things - name: "Windows MSVC" os: windows-latest - toolchain: "" cpp: ON fortran: OFF java: ON @@ -83,7 +82,6 @@ jobs: mirror_vfd: ON direct_vfd: ON ros3_vfd: ON - toolchain: "-DCMAKE_TOOLCHAIN_FILE=config/toolchain/gcc.cmake" generator: "-G Ninja" run_tests: true @@ -106,7 +104,6 @@ jobs: mirror_vfd: ON direct_vfd: OFF ros3_vfd: OFF - toolchain: "-DCMAKE_TOOLCHAIN_FILE=config/toolchain/clang.cmake" generator: "-G Ninja" run_tests: true @@ -182,7 +179,6 @@ jobs: cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake \ ${{ matrix.generator }} \ -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} \ - ${{ matrix.toolchain }} \ -DBUILD_SHARED_LIBS=ON \ -DHDF5_ENABLE_ALL_WARNINGS=ON \ -DHDF5_ENABLE_DOXY_WARNINGS=ON \ @@ -210,7 +206,6 @@ jobs: cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake \ ${{ matrix.generator }} \ -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} \ - ${{ matrix.toolchain }} \ -DBUILD_SHARED_LIBS=ON \ -DBUILD_STATIC_LIBS=${{ (matrix.os != 'windows-latest') }} \ -DHDF5_ENABLE_ALL_WARNINGS=ON \ |