diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/H5pubconf.h.in | 2 | ||||
| -rw-r--r-- | config/cmake/scripts/HDF5config.cmake | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index fdf4c7d..600b046 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -733,7 +733,7 @@ #cmakedefine H5_USE_114_API_DEFAULT @H5_USE_114_API_DEFAULT@ /* Define if the library will use file locking */ -#cmakedefine H5_FILE_LOCKING @H5_USE_FILE_LOCKING@ +#cmakedefine H5_USE_FILE_LOCKING @H5_USE_FILE_LOCKING@ /* Define if a memory checking tool will be used on the library, to cause library to be very picky about memory operations and also disable the diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake index 7b7560f..3a8d5b7 100644 --- a/config/cmake/scripts/HDF5config.cmake +++ b/config/cmake/scripts/HDF5config.cmake @@ -21,6 +21,7 @@ cmake_minimum_required (VERSION 3.12) # ctest -S HDF5config.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") |