diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-08-26 15:17:40 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-08-26 15:17:40 (GMT) |
| commit | b09c17ab2eb1d98e769fe6058cfc388fdba5358c (patch) | |
| tree | aa7d754d6926062e54ef64975db452adcabaa872 | |
| parent | 67ceb170da4558de16c1092a508a2a38b5c1ae42 (diff) | |
| download | hdf5-b09c17ab2eb1d98e769fe6058cfc388fdba5358c.zip hdf5-b09c17ab2eb1d98e769fe6058cfc388fdba5358c.tar.gz hdf5-b09c17ab2eb1d98e769fe6058cfc388fdba5358c.tar.bz2 | |
MinGW uses "MinGW Makefiles"
| -rw-r--r-- | .github/workflows/main.yml | 4 | ||||
| -rwxr-xr-x | config/cmake/scripts/HDF5config.cmake | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a3fdadb..60e21c7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,8 +4,8 @@ name: hdf5 dev CI on: push: branches: [ develop, hdf5_1_12, hdf5_1_10, hdf5_1_8 ] -# pull_request: -# branches: [ develop ] + pull_request: + branches: [ develop, hdf5_1_12, hdf5_1_10, hdf5_1_8 ] # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake index 5427118..2665c33 100755 --- a/config/cmake/scripts/HDF5config.cmake +++ b/config/cmake/scripts/HDF5config.cmake @@ -21,6 +21,7 @@ cmake_minimum_required (VERSION 3.12) # ctest -S HDF518config.cmake,OPTION=VALUE -C Release -VV -O test.log # where valid options for OPTION are: # BUILD_GENERATOR - The cmake build generator: +# MinGW * MinGW Makefiles # Unix * Unix Makefiles # VS2019 * Visual Studio 16 2019 # VS201964 * Visual Studio 16 2019 @@ -167,7 +168,11 @@ if (NOT DEFINED HPC) ## Set the following to unique id your computer ## set (CTEST_SITE "WIN7${BUILD_GENERATOR}.XXXX") else () - set (CTEST_CMAKE_GENERATOR "Unix Makefiles") + if (MINGW) + set (CTEST_CMAKE_GENERATOR "MinGW Makefiles") + else () + set (CTEST_CMAKE_GENERATOR "Unix Makefiles") + endif () ## Set the following to unique id your computer ## if (APPLE) set (CTEST_SITE "MAC.XXXX") |