diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-28 19:00:02 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-01-29 14:11:11 (GMT) |
| commit | ab9fa54d4841e5b0eff8d241ad8edb47401b0394 (patch) | |
| tree | 4675b0ba7baef215961e07d4cd03d68d4fbcd158 /Tests/CMakeLists.txt | |
| parent | 11e2e6cadf7f0ee36b7ccecaa11457949382b75f (diff) | |
| download | CMake-ab9fa54d4841e5b0eff8d241ad8edb47401b0394.zip CMake-ab9fa54d4841e5b0eff8d241ad8edb47401b0394.tar.gz CMake-ab9fa54d4841e5b0eff8d241ad8edb47401b0394.tar.bz2 | |
Xcode: Switch to internal CMAKE_MAKE_PROGRAM lookup by generator (#15324)
The "cmakexbuild" wrapper is not needed for Xcode 4 and above, and the
path to it may change when CMake moves. Avoid storing a specific path
to a build program in CMakeCache.txt and instead compute the value for
CMAKE_MAKE_PROGRAM on demand. However, if a user does set the value
explicitly then honor it.
This does for Xcode what commit v3.0.0-rc1~260^2~4 (VS: Switch to
internal CMAKE_MAKE_PROGRAM lookup by generators, 2013-11-15) did for
Visual Studio generators.
Diffstat (limited to 'Tests/CMakeLists.txt')
| -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}") |