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 /Source/cmGlobalGenerator.cxx | |
| 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 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 4c95a9f..6d0fedc 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -315,25 +315,6 @@ void cmGlobalGenerator::FindMakeProgram(cmMakefile* mf) "make program", cmCacheManager::FILEPATH); } - - if(makeProgram.find("xcodebuild") != makeProgram.npos) - { - // due to the text file busy /bin/sh problem with xcodebuild - // use the cmakexbuild wrapper instead. This program - // will run xcodebuild and if it sees the error text file busy - // it will stop forwarding output, and let the build finish. - // Then it will retry the build. It will continue this - // until no text file busy errors occur. - std::string cmakexbuild = - this->CMakeInstance->GetCacheManager()->GetCacheValue("CMAKE_COMMAND"); - cmakexbuild = cmakexbuild.substr(0, cmakexbuild.length()-5); - cmakexbuild += "cmakexbuild"; - - mf->AddCacheDefinition("CMAKE_MAKE_PROGRAM", - cmakexbuild.c_str(), - "make program", - cmCacheManager::FILEPATH); - } } // enable the given language |