diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-11-18 21:34:04 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-11-18 21:34:04 (GMT) |
| commit | 144e7a600c7db5a5ba23db882d7c1d6f758d82d2 (patch) | |
| tree | f644532d6432befb9f87d5a5a9164dfe1cae5c6a /config/cmake_ext_mod | |
| parent | d82d2e981acb7506fcc6856f3deab9499bbf5fd6 (diff) | |
| download | hdf5-144e7a600c7db5a5ba23db882d7c1d6f758d82d2.zip hdf5-144e7a600c7db5a5ba23db882d7c1d6f758d82d2.tar.gz hdf5-144e7a600c7db5a5ba23db882d7c1d6f758d82d2.tar.bz2 | |
HDFFV-10962 add VS2019 support
Diffstat (limited to 'config/cmake_ext_mod')
| -rw-r--r-- | config/cmake_ext_mod/HDFMacros.cmake | 8 | ||||
| -rw-r--r-- | config/cmake_ext_mod/HDFUseFortran.cmake | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake index e320c07..148e9d7 100644 --- a/config/cmake_ext_mod/HDFMacros.cmake +++ b/config/cmake_ext_mod/HDFMacros.cmake @@ -261,6 +261,10 @@ macro (HDF_README_PROPERTIES target_fortran) set (BINARY_PLATFORM "${BINARY_PLATFORM} Intel") if (${CMAKE_C_COMPILER_VERSION} MATCHES "^17.*") set (BINARY_PLATFORM "${BINARY_PLATFORM}, using Intel 17") + elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^18.*") + set (BINARY_PLATFORM "${BINARY_PLATFORM}, using Intel 18") + elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.*") + set (BINARY_PLATFORM "${BINARY_PLATFORM}, using Intel 19") else () set (BINARY_PLATFORM "${BINARY_PLATFORM}, using Intel ${CMAKE_C_COMPILER_VERSION}") endif () @@ -277,8 +281,10 @@ 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") - else () + elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.16.*") set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2017") + else () #19.23 + set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2019") endif () else () set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO ${CMAKE_C_COMPILER_VERSION}") diff --git a/config/cmake_ext_mod/HDFUseFortran.cmake b/config/cmake_ext_mod/HDFUseFortran.cmake index bfb45fa..1cce918 100644 --- a/config/cmake_ext_mod/HDFUseFortran.cmake +++ b/config/cmake_ext_mod/HDFUseFortran.cmake @@ -192,7 +192,7 @@ CHECK_FORTRAN_FEATURE(iso_c_binding #----------------------------------------------------------------------------- if (CMAKE_Fortran_COMPILER MATCHES ifort) if (WIN32 AND NOT MINGW) - set (CMAKE_Fortran_FLAGS_DEBUG "/debug:full /dbglibs " CACHE "flags" STRING FORCE) - set (CMAKE_EXE_LINKER_FLAGS_DEBUG "/DEBUG" CACHE "flags" STRING FORCE) + set (CMAKE_Fortran_FLAGS_DEBUG "/debug:full /dbglibs " CACHE STRING "flags" FORCE) + set (CMAKE_EXE_LINKER_FLAGS_DEBUG "/DEBUG" CACHE STRING "flags" FORCE) endif () endif () |