diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-03-23 17:36:30 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-03-23 17:36:30 (GMT) |
| commit | 0e01f589e7795a2a42a7299dfe34c08bc1d40f97 (patch) | |
| tree | c97b378a2d16fd0e269905b7ed9465a0ea8a06f1 | |
| parent | e79f9a73feb1b18c52a1608336aff612d2732d5b (diff) | |
| parent | ef3e20d9880c7daf0d2ec68d261b94a6a6dbb642 (diff) | |
| download | hdf5-0e01f589e7795a2a42a7299dfe34c08bc1d40f97.zip hdf5-0e01f589e7795a2a42a7299dfe34c08bc1d40f97.tar.gz hdf5-0e01f589e7795a2a42a7299dfe34c08bc1d40f97.tar.bz2 | |
Merge pull request #992 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'ef3e20d9880c7daf0d2ec68d261b94a6a6dbb642':
Correct if block typo
Correct VS version for readme
| -rw-r--r-- | config/cmake_ext_mod/HDFMacros.cmake | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake index bdc52b9..04d60e1 100644 --- a/config/cmake_ext_mod/HDFMacros.cmake +++ b/config/cmake_ext_mod/HDFMacros.cmake @@ -291,9 +291,11 @@ macro (HDF_README_PROPERTIES target_fortran) elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^18.*") set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2013") elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.*") - set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2015") - elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^20.*") - set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2017") + if (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.0.*") + set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2015") + else () + set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2017") + endif () else () set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO ${CMAKE_C_COMPILER_VERSION}") endif () |