diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-09 19:30:10 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-01-11 16:04:51 (GMT) |
| commit | 57e48f16f2c3b73fb27057267c8092a41005bb75 (patch) | |
| tree | a4ffcf1bb1bcb8186ca7504cadd1ad5618852f50 /Tests/RunCMake/GeneratorPlatform | |
| parent | bdef729646a5a559c295ef9c0fb83eb8a6b34905 (diff) | |
| download | CMake-57e48f16f2c3b73fb27057267c8092a41005bb75.zip CMake-57e48f16f2c3b73fb27057267c8092a41005bb75.tar.gz CMake-57e48f16f2c3b73fb27057267c8092a41005bb75.tar.bz2 | |
VS: Add Visual Studio 16 2019 generator
Add this generator *without* support for specifying the target
architecture in the generator name. cmake-gui will be taught
to provide a field for this, and command-line builds can use -A.
Also, teach this generator to select a default target architecture
based on the host architecture.
Fixes: #18689
Inspired-by: Egor Pugin <egor.pugin@gmail.com>
Diffstat (limited to 'Tests/RunCMake/GeneratorPlatform')
| -rw-r--r-- | Tests/RunCMake/GeneratorPlatform/RunCMakeTest.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/RunCMake/GeneratorPlatform/RunCMakeTest.cmake b/Tests/RunCMake/GeneratorPlatform/RunCMakeTest.cmake index 27250cb..27ede06 100644 --- a/Tests/RunCMake/GeneratorPlatform/RunCMakeTest.cmake +++ b/Tests/RunCMake/GeneratorPlatform/RunCMakeTest.cmake @@ -3,7 +3,7 @@ include(RunCMake) set(RunCMake_GENERATOR_PLATFORM "") run_cmake(NoPlatform) -if("${RunCMake_GENERATOR}" MATCHES "^Visual Studio ([89]|1[01245])( 20[0-9][0-9])?$") +if("${RunCMake_GENERATOR}" MATCHES "^Visual Studio ([89]|1[012456])( 20[0-9][0-9])?$") set(RunCMake_GENERATOR_PLATFORM "x64") run_cmake(x64Platform) else() @@ -17,7 +17,7 @@ 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])?$") +if("${RunCMake_GENERATOR}" MATCHES "^Visual Studio ([89]|1[012456])( 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) |