diff options
| author | Brad King <brad.king@kitware.com> | 2014-06-30 18:50:34 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-06-30 18:50:34 (GMT) |
| commit | 1563668fd0020ee1e2a59b97827468777e3b7955 (patch) | |
| tree | 4a1af74d2b60244fbf9c9c26ef059fb24dfdde59 /Tests/RunCMake | |
| parent | 4f7f6651830b847de006bf8bdc5cbd4a9e39805f (diff) | |
| parent | f0e298ad661a82f8368c7adea14e912d36ae8886 (diff) | |
| download | CMake-1563668fd0020ee1e2a59b97827468777e3b7955.zip CMake-1563668fd0020ee1e2a59b97827468777e3b7955.tar.gz CMake-1563668fd0020ee1e2a59b97827468777e3b7955.tar.bz2 | |
Merge topic 'vs14-generator'
f0e298ad Help: Add notes for topic 'vs14-generator'
5c105140 Tests: Simplify LoadCommand tests
b1cbd577 FindBoost: Add -vc140 mangling for VS 14
bdc7d9c8 VS14: Fix Cl and Link flag tables as previous versions
d96b3f68 VS14: Generate flag tables from MSBuild v140 tool files
65624c39 VS14: Add Visual Studio 14 generator (#14982)
8635ac23 Tests/Preprocess: Remove unnecessary VS version tests
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake b/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake index d39f33f..6220657 100644 --- a/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake +++ b/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake @@ -3,7 +3,7 @@ include(RunCMake) set(RunCMake_GENERATOR_TOOLSET "") run_cmake(NoToolset) -if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[012]|Xcode" AND NOT XCODE_BELOW_3) +if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[0124]|Xcode" AND NOT XCODE_BELOW_3) set(RunCMake_GENERATOR_TOOLSET "Test Toolset") run_cmake(TestToolset) else() @@ -17,7 +17,7 @@ set(RunCMake_TEST_OPTIONS -T "Extra Toolset") run_cmake(TwoToolsets) unset(RunCMake_TEST_OPTIONS) -if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[012]|Xcode" AND NOT XCODE_BELOW_3) +if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[0124]|Xcode" AND NOT XCODE_BELOW_3) set(RunCMake_TEST_OPTIONS -DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/TestToolset-toolchain.cmake) run_cmake(TestToolsetToolchain) unset(RunCMake_TEST_OPTIONS) |