diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2019-11-20 20:19:59 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2019-11-20 20:19:59 (GMT) |
commit | b1f884f5a4f48a023f9aeb2eba1426299f348a49 (patch) | |
tree | f7116b7d8ae37d903f9ad4262c8ac44aa525680d /config/cmake/scripts/HDF5config.cmake | |
parent | 7200bce6462f023130edc6344333eb0d79cde7fc (diff) | |
parent | ec145b88fa2adcb87483864a5a8296eda9223577 (diff) | |
download | hdf5-b1f884f5a4f48a023f9aeb2eba1426299f348a49.zip hdf5-b1f884f5a4f48a023f9aeb2eba1426299f348a49.tar.gz hdf5-b1f884f5a4f48a023f9aeb2eba1426299f348a49.tar.bz2 |
Merge pull request #2052 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'ec145b88fa2adcb87483864a5a8296eda9223577':
HDFFV-10962 add VS2019 support
Diffstat (limited to 'config/cmake/scripts/HDF5config.cmake')
-rwxr-xr-x | config/cmake/scripts/HDF5config.cmake | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake index 5b2de89..def5417 100755 --- a/config/cmake/scripts/HDF5config.cmake +++ b/config/cmake/scripts/HDF5config.cmake @@ -22,6 +22,8 @@ cmake_minimum_required (VERSION 3.10) # where valid options for OPTION are: # BUILD_GENERATOR - The cmake build generator: # Unix * Unix Makefiles +# VS2019 * Visual Studio 16 2019 +# VS201964 * Visual Studio 16 2019 # VS2017 * Visual Studio 15 2017 # VS201764 * Visual Studio 15 2017 Win64 # VS2015 * Visual Studio 14 2015 @@ -106,8 +108,20 @@ if (NOT DEFINED HPC) endif () if (WIN32 AND NOT MINGW) set (SITE_OS_NAME "Windows") - set (SITE_OS_VERSION "WIN7") - if (BUILD_GENERATOR STREQUAL "VS201764") + set (SITE_OS_VERSION "WIN10") + if (BUILD_GENERATOR STREQUAL "VS201964") + set (CTEST_CMAKE_GENERATOR "Visual Studio 16 2019") + set (CMAKE_GENERATOR_ARCHITECTURE "x64") + set (SITE_OS_BITS "64") + set (SITE_COMPILER_NAME "vs2019") + set (SITE_COMPILER_VERSION "16") + elseif (BUILD_GENERATOR STREQUAL "VS2019") + set (CTEST_CMAKE_GENERATOR "Visual Studio 16 2019") + set (CMAKE_GENERATOR_ARCHITECTURE "Win32") + set (SITE_OS_BITS "32") + set (SITE_COMPILER_NAME "vs2019") + set (SITE_COMPILER_VERSION "16") + elseif (BUILD_GENERATOR STREQUAL "VS201764") set (CTEST_CMAKE_GENERATOR "Visual Studio 15 2017 Win64") set (SITE_OS_BITS "64") set (SITE_COMPILER_NAME "vs2017") |