diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-28 18:59:32 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-01-28 19:01:55 (GMT) |
| commit | 11e2e6cadf7f0ee36b7ccecaa11457949382b75f (patch) | |
| tree | 9a3431ca4633604cd973c73aee4bc3ee8abe9d37 /Source | |
| parent | e4055a6144c63c83fe2f39440ecfb9a0bcbfae0d (diff) | |
| download | CMake-11e2e6cadf7f0ee36b7ccecaa11457949382b75f.zip CMake-11e2e6cadf7f0ee36b7ccecaa11457949382b75f.tar.gz CMake-11e2e6cadf7f0ee36b7ccecaa11457949382b75f.tar.bz2 | |
Xcode: Select make program at build time
Extend the change made in commit v3.0.0-rc1~260^2~16 (Teach
GenerateBuildCommand to find its own make program, 2013-11-13) to have
the Xcode generator pick between "xcodebuild" and CMake's own copy of
"cmakexbuild" at build time based on the version of Xcode.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 3b4dd17..ebad7da 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -303,7 +303,7 @@ cmGlobalXCodeGenerator::GenerateBuildCommand( { // now build the test makeCommand.push_back( - this->SelectMakeProgram(makeProgram, "xcodebuild") + this->SelectMakeProgram(makeProgram, this->GetXcodeBuildCommand()) ); makeCommand.push_back("-project"); |