diff options
| author | Brad King <brad.king@kitware.com> | 2017-05-03 15:04:08 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-05-03 15:04:17 (GMT) |
| commit | 1fe2dc5ef2a1f262b125a2ba6a85f624ce150dd2 (patch) | |
| tree | a1b7bdc9761376b32692223fc2b8b43bb4b4db29 /Tests | |
| parent | bf3c08d648c398026eef363bb43d3f8bfaf2a286 (diff) | |
| parent | 7e75568b001e29a7428d7489c57cebd909359571 (diff) | |
| download | CMake-1fe2dc5ef2a1f262b125a2ba6a85f624ce150dd2.zip CMake-1fe2dc5ef2a1f262b125a2ba6a85f624ce150dd2.tar.gz CMake-1fe2dc5ef2a1f262b125a2ba6a85f624ce150dd2.tar.bz2 | |
Merge topic 'ipo-xcode'
7e75568b Xcode: Support IPO (LTO)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !785
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/CMP0069/RunCMakeTest.cmake | 3 | ||||
| -rw-r--r-- | Tests/RunCMake/CheckIPOSupported/RunCMakeTest.cmake | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Tests/RunCMake/CMP0069/RunCMakeTest.cmake b/Tests/RunCMake/CMP0069/RunCMakeTest.cmake index 61ba458..f44f840 100644 --- a/Tests/RunCMake/CMP0069/RunCMakeTest.cmake +++ b/Tests/RunCMake/CMP0069/RunCMakeTest.cmake @@ -5,7 +5,6 @@ run_cmake(CMP0069-NEW-cmake) run_cmake(CMP0069-NEW-compiler) run_cmake(CMP0069-WARN) -string(COMPARE EQUAL "${RunCMake_GENERATOR}" "Xcode" is_xcode) -if(is_xcode OR RunCMake_GENERATOR MATCHES "^Visual Studio ") +if(RunCMake_GENERATOR MATCHES "^Visual Studio ") run_cmake(CMP0069-NEW-generator) endif() diff --git a/Tests/RunCMake/CheckIPOSupported/RunCMakeTest.cmake b/Tests/RunCMake/CheckIPOSupported/RunCMakeTest.cmake index 588a75d..e145569 100644 --- a/Tests/RunCMake/CheckIPOSupported/RunCMakeTest.cmake +++ b/Tests/RunCMake/CheckIPOSupported/RunCMakeTest.cmake @@ -8,6 +8,6 @@ run_cmake(not-supported-by-compiler) run_cmake(save-to-result) run_cmake(cmp0069-is-old) -if(RunCMake_GENERATOR MATCHES "^(Visual Studio |Xcode$)") +if(RunCMake_GENERATOR MATCHES "^Visual Studio ") run_cmake(not-supported-by-generator) endif() |