diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-29 14:14:00 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-29 14:14:00 (GMT) |
| commit | 326cfe2b30f0223ba676b966dc49a74972e4e4fb (patch) | |
| tree | ef2953bd52b057efc6db8126118bc0a0a903646e /Tests | |
| parent | 98659aecfd819eb1e7771f7420933316a628b057 (diff) | |
| parent | ab9fa54d4841e5b0eff8d241ad8edb47401b0394 (diff) | |
| download | CMake-326cfe2b30f0223ba676b966dc49a74972e4e4fb.zip CMake-326cfe2b30f0223ba676b966dc49a74972e4e4fb.tar.gz CMake-326cfe2b30f0223ba676b966dc49a74972e4e4fb.tar.bz2 | |
Merge topic 'xcode-revise-make-program'
ab9fa54d Xcode: Switch to internal CMAKE_MAKE_PROGRAM lookup by generator (#15324)
11e2e6ca Xcode: Select make program at build time
e4055a61 Xcode: Add internal API to find xcodebuild
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 3aecd9b..035f161 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -51,7 +51,7 @@ if(BUILD_TESTING) set(CMake_TEST_DEVENV "${CMAKE_MAKE_PROGRAM}") endif() - if(CMAKE_GENERATOR MATCHES "Visual Studio") + if(CMAKE_GENERATOR MATCHES "Visual Studio|Xcode") set(CMake_TEST_EXPLICIT_MAKE_PROGRAM "") else() set(CMake_TEST_EXPLICIT_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM}") |