diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-08 20:25:23 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-02-15 13:15:37 (GMT) |
| commit | f773933f2630a17ce6b3b2aa6f8d7d8b65eb336c (patch) | |
| tree | 5efd0ff7844eadfdf37c045bba5c8ea09e967aa8 /Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake | |
| parent | d9e2b9a909b5f5b51ef3a106ed1d60a8d4cb795a (diff) | |
| download | CMake-f773933f2630a17ce6b3b2aa6f8d7d8b65eb336c.zip CMake-f773933f2630a17ce6b3b2aa6f8d7d8b65eb336c.tar.gz CMake-f773933f2630a17ce6b3b2aa6f8d7d8b65eb336c.tar.bz2 | |
VS: Refactor generator toolset parsing
We parse `CMAKE_GENERATOR_TOOLSET` values of the forms:
* `toolset`
* `toolset,host=x64`
* `host=x64`
Generalize the parsing to support the forms:
* `toolset`
* `toolset[,key=value]*`
* `key=value[,key=value]*`
Disallow duplicate keys. Require all but the first field to
be of `key=value` form.
Diffstat (limited to 'Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake')
| -rw-r--r-- | Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake b/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake index 3c3d974..44c67a2 100644 --- a/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake +++ b/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake @@ -17,10 +17,14 @@ if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[01245]") run_cmake(TestToolsetHostArchNone) set(RunCMake_GENERATOR_TOOLSET "Test Toolset,host=x65") run_cmake(BadToolsetHostArch) + set(RunCMake_GENERATOR_TOOLSET "Test Toolset,host=x64,host=x64") + run_cmake(BadToolsetHostArchTwice) else() set(RunCMake_GENERATOR_TOOLSET "Test Toolset,host=x64") run_cmake(BadToolsetHostArch) endif() + set(RunCMake_GENERATOR_TOOLSET "Test Toolset,not_a_key") + run_cmake(BadToolsetFormat) elseif("${RunCMake_GENERATOR}" STREQUAL "Xcode" AND NOT XCODE_BELOW_3) set(RunCMake_GENERATOR_TOOLSET "Test Toolset") run_cmake(TestToolset) |