mirror of
https://github.com/Kitware/CMake.git
synced 2026-05-01 03:29:18 -05:00
Tests: Split out RunCMake.GeneratorToolset Xcode checks
This will allow the behavior of VS and Xcode generators to differ.
This commit is contained in:
@@ -0,0 +1 @@
|
|||||||
|
1
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
CMake Error at CMakeLists.txt:[0-9]+ \(project\):
|
||||||
|
Generator
|
||||||
|
|
||||||
|
.*
|
||||||
|
|
||||||
|
does not recognize the toolset
|
||||||
|
|
||||||
|
Test Toolset,host=x6[45]
|
||||||
|
|
||||||
|
that was specified\.$
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
message(FATAL_ERROR "This should not be reached!")
|
||||||
@@ -3,7 +3,7 @@ include(RunCMake)
|
|||||||
set(RunCMake_GENERATOR_TOOLSET "")
|
set(RunCMake_GENERATOR_TOOLSET "")
|
||||||
run_cmake(NoToolset)
|
run_cmake(NoToolset)
|
||||||
|
|
||||||
if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[01245]|Xcode" AND NOT XCODE_BELOW_3)
|
if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[01245]")
|
||||||
set(RunCMake_GENERATOR_TOOLSET "Test Toolset")
|
set(RunCMake_GENERATOR_TOOLSET "Test Toolset")
|
||||||
run_cmake(TestToolset)
|
run_cmake(TestToolset)
|
||||||
if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[245]")
|
if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[245]")
|
||||||
@@ -21,6 +21,11 @@ if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[01245]|Xcode" AND NOT XCODE_
|
|||||||
set(RunCMake_GENERATOR_TOOLSET "Test Toolset,host=x64")
|
set(RunCMake_GENERATOR_TOOLSET "Test Toolset,host=x64")
|
||||||
run_cmake(BadToolsetHostArch)
|
run_cmake(BadToolsetHostArch)
|
||||||
endif()
|
endif()
|
||||||
|
elseif("${RunCMake_GENERATOR}" STREQUAL "Xcode" AND NOT XCODE_BELOW_3)
|
||||||
|
set(RunCMake_GENERATOR_TOOLSET "Test Toolset")
|
||||||
|
run_cmake(TestToolset)
|
||||||
|
set(RunCMake_GENERATOR_TOOLSET "Test Toolset,host=x64")
|
||||||
|
run_cmake(BadToolsetHostArchXcode)
|
||||||
else()
|
else()
|
||||||
set(RunCMake_GENERATOR_TOOLSET "Bad Toolset")
|
set(RunCMake_GENERATOR_TOOLSET "Bad Toolset")
|
||||||
run_cmake(BadToolset)
|
run_cmake(BadToolset)
|
||||||
|
|||||||
Reference in New Issue
Block a user