diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2022-06-12 04:06:49 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-12 04:06:49 (GMT) |
| commit | 2a147be72f29bbe5077bdb7b21b74fc5d24f1b44 (patch) | |
| tree | a9549d2f2c1ed4f0635f47d334005cbc0ff092b4 /config/cmake_ext_mod | |
| parent | 4466a30825eda620a00e5d8fac35ecf765296aad (diff) | |
| download | hdf5-2a147be72f29bbe5077bdb7b21b74fc5d24f1b44.zip hdf5-2a147be72f29bbe5077bdb7b21b74fc5d24f1b44.tar.gz hdf5-2a147be72f29bbe5077bdb7b21b74fc5d24f1b44.tar.bz2 | |
Hdf5 1 12 sync (#1794)
Diffstat (limited to 'config/cmake_ext_mod')
| -rw-r--r-- | config/cmake_ext_mod/ConfigureChecks.cmake | 4 | ||||
| -rw-r--r-- | config/cmake_ext_mod/HDFMacros.cmake | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/config/cmake_ext_mod/ConfigureChecks.cmake b/config/cmake_ext_mod/ConfigureChecks.cmake index 7b2c4eb..41f53e1 100644 --- a/config/cmake_ext_mod/ConfigureChecks.cmake +++ b/config/cmake_ext_mod/ConfigureChecks.cmake @@ -293,10 +293,10 @@ if (MINGW OR NOT WINDOWS) else () set (TEST_LFS_WORKS "" CACHE INTERNAL ${msg}) if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0") - message (VERBOSE "${msg}... no") + message (VERBOSE "${msg}... no") endif () file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log - "Test TEST_LFS_WORKS Run failed with the following exit code:\n ${TEST_LFS_WORKS_RUN}\n" + "Test TEST_LFS_WORKS Run failed with the following exit code:\n ${TEST_LFS_WORKS_RUN}\n" ) endif () else () diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake index 0f9b367..260fd55 100644 --- a/config/cmake_ext_mod/HDFMacros.cmake +++ b/config/cmake_ext_mod/HDFMacros.cmake @@ -267,10 +267,14 @@ macro (HDF_README_PROPERTIES target_fortran) elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.*") if (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.0.*") set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2015") - elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.16.*") + elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.1.*") set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2017") - else () #19.23 + elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.2.*") set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2019") + elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.3.*") + set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2022") + else () + set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO ???") endif () else () set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO ${CMAKE_C_COMPILER_VERSION}") |