diff options
| author | Brad King <brad.king@kitware.com> | 2019-04-19 11:59:28 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-04-19 11:59:28 (GMT) |
| commit | cb733eb4a6e2c0246af55e3080e541d36aec3db6 (patch) | |
| tree | 7d8918fc5cf498dc66548024181a80128a8c4721 /Tests | |
| parent | c648551bea65c6457f21b608f31c4ccd5b69a0fa (diff) | |
| parent | db02be85a0bcccb633b31f087cde96d95fd21e8f (diff) | |
| download | CMake-cb733eb4a6e2c0246af55e3080e541d36aec3db6.zip CMake-cb733eb4a6e2c0246af55e3080e541d36aec3db6.tar.gz CMake-cb733eb4a6e2c0246af55e3080e541d36aec3db6.tar.bz2 | |
Merge branch 'vs-default-platform' into release-3.14
Merge-request: !3246
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/GeneratorPlatform/TestPlatform-toolchain.cmake | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/GeneratorPlatform/TestPlatformToolchain-stderr.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Tests/RunCMake/GeneratorPlatform/TestPlatform-toolchain.cmake b/Tests/RunCMake/GeneratorPlatform/TestPlatform-toolchain.cmake index 763478c..d8138b8 100644 --- a/Tests/RunCMake/GeneratorPlatform/TestPlatform-toolchain.cmake +++ b/Tests/RunCMake/GeneratorPlatform/TestPlatform-toolchain.cmake @@ -1 +1,2 @@ +message("CMAKE_VS_PLATFORM_NAME_DEFAULT is \"${CMAKE_VS_PLATFORM_NAME_DEFAULT}\"") set(CMAKE_GENERATOR_PLATFORM "Test Platform") diff --git a/Tests/RunCMake/GeneratorPlatform/TestPlatformToolchain-stderr.txt b/Tests/RunCMake/GeneratorPlatform/TestPlatformToolchain-stderr.txt index b9bb3b2..6867790 100644 --- a/Tests/RunCMake/GeneratorPlatform/TestPlatformToolchain-stderr.txt +++ b/Tests/RunCMake/GeneratorPlatform/TestPlatformToolchain-stderr.txt @@ -1,3 +1,4 @@ +CMAKE_VS_PLATFORM_NAME_DEFAULT is "[^"]+" CMake Error at TestPlatformToolchain.cmake:[0-9]+ \(message\): CMAKE_GENERATOR_PLATFORM is "Test Platform" as expected. Call Stack \(most recent call first\): |