philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add VS2019 support

Browse Source
This commit is contained in:
Allen Byrne
2019-11-18 14:58:06 -06:00
parent 3f9c7efbd9
commit 265325fb9a
11 changed files with 64 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
config/cmake/scripts/HDF5config.cmake
View File

@@ -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")