diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2018-03-27 04:19:52 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2018-03-27 04:19:52 (GMT) |
| commit | 6303e24a2fe22e5e25638a59071c7cdfcf85a941 (patch) | |
| tree | cbd503a449567b3e4c921cf2c953d6327a972dce | |
| parent | eecf997bf579d9e9591b1ee3797f499319bbdfe5 (diff) | |
| parent | 0e01f589e7795a2a42a7299dfe34c08bc1d40f97 (diff) | |
| download | hdf5-6303e24a2fe22e5e25638a59071c7cdfcf85a941.zip hdf5-6303e24a2fe22e5e25638a59071c7cdfcf85a941.tar.gz hdf5-6303e24a2fe22e5e25638a59071c7cdfcf85a941.tar.bz2 | |
Merge remote-tracking branch 'origin/develop' into merge_func_enter_vol
| -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 () |