summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-03-09 12:34:17 (GMT)
committerBrad King <brad.king@kitware.com>2021-03-09 12:35:18 (GMT)
commit6fd7e8c53f83ed5b38dd7a5ca9383b22dc6739cf (patch)
tree4cb9f10ed9eb16cf47f76f367fd998e0e5b813e9 /Tests
parenta8954cc3c47a1a9459ddbe10f5b288e466872076 (diff)
downloadCMake-6fd7e8c53f83ed5b38dd7a5ca9383b22dc6739cf.zip
CMake-6fd7e8c53f83ed5b38dd7a5ca9383b22dc6739cf.tar.gz
CMake-6fd7e8c53f83ed5b38dd7a5ca9383b22dc6739cf.tar.bz2
Tests: Make RunCMake.Generator{Platform,Toolset} two-flag cases explicit
Do not rely on the RunCMake infrastructure to pass `-T` or `-A`.
Diffstat (limited to 'Tests')
-rw-r--r--Tests/RunCMake/GeneratorPlatform/RunCMakeTest.cmake4
-rw-r--r--Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake2
2 files changed, 3 insertions, 3 deletions
diff --git a/Tests/RunCMake/GeneratorPlatform/RunCMakeTest.cmake b/Tests/RunCMake/GeneratorPlatform/RunCMakeTest.cmake
index 27ede06..83e63f9 100644
--- a/Tests/RunCMake/GeneratorPlatform/RunCMakeTest.cmake
+++ b/Tests/RunCMake/GeneratorPlatform/RunCMakeTest.cmake
@@ -11,9 +11,9 @@ else()
run_cmake(BadPlatform)
endif()
-set(RunCMake_GENERATOR_TOOLSET "")
+set(RunCMake_GENERATOR_PLATFORM "")
-set(RunCMake_TEST_OPTIONS -A "Extra Platform")
+set(RunCMake_TEST_OPTIONS -A "Test Platform" -A "Extra Platform")
run_cmake(TwoPlatforms)
unset(RunCMake_TEST_OPTIONS)
diff --git a/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake b/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake
index 5f12d79..75ed677 100644
--- a/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake
+++ b/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake
@@ -76,7 +76,7 @@ endif()
set(RunCMake_GENERATOR_TOOLSET "")
-set(RunCMake_TEST_OPTIONS -T "Extra Toolset")
+set(RunCMake_TEST_OPTIONS -T "Test Toolset" -T "Extra Toolset")
run_cmake(TwoToolsets)
unset(RunCMake_TEST_OPTIONS)