bdc679a8ae
Call the generator "Visual Studio 15" without any year because the preview version of VS 15 does not provide a year in the product name. Copy cmGlobalVisualStudio14Generator to cmGlobalVisualStudio15Generator and update version numbers accordingly. Add the VS15 enumeration value. Note that we do not need to add a MSVC15 variable or v150 toolset because Visual Studio 15 comes with an updated version of the v140 toolset and remains ABI-compatible. Teach tests VSExternalInclude, RunCMake.GeneratorPlatform, and RunCMake.GeneratorToolset to treat VS 15 as they do VS 10-14. Closes: #16143
29 lines
897 B
CMake
29 lines
897 B
CMake
include(RunCMake)
|
|
|
|
set(RunCMake_GENERATOR_PLATFORM "")
|
|
run_cmake(NoPlatform)
|
|
|
|
if("${RunCMake_GENERATOR}" MATCHES "^Visual Studio ([89]|1[01245])( 20[0-9][0-9])?$")
|
|
set(RunCMake_GENERATOR_PLATFORM "x64")
|
|
run_cmake(x64Platform)
|
|
else()
|
|
set(RunCMake_GENERATOR_PLATFORM "Bad Platform")
|
|
run_cmake(BadPlatform)
|
|
endif()
|
|
|
|
set(RunCMake_GENERATOR_TOOLSET "")
|
|
|
|
set(RunCMake_TEST_OPTIONS -A "Extra Platform")
|
|
run_cmake(TwoPlatforms)
|
|
unset(RunCMake_TEST_OPTIONS)
|
|
|
|
if("${RunCMake_GENERATOR}" MATCHES "^Visual Studio ([89]|1[01245])( 20[0-9][0-9])?$")
|
|
set(RunCMake_TEST_OPTIONS -DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/TestPlatform-toolchain.cmake)
|
|
run_cmake(TestPlatformToolchain)
|
|
unset(RunCMake_TEST_OPTIONS)
|
|
else()
|
|
set(RunCMake_TEST_OPTIONS -DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/BadPlatform-toolchain.cmake)
|
|
run_cmake(BadPlatformToolchain)
|
|
unset(RunCMake_TEST_OPTIONS)
|
|
endif()
|