diff options
| author | Brad King <brad.king@kitware.com> | 2017-08-24 15:43:06 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-08-24 15:43:06 (GMT) |
| commit | e498dad3f274b9493ce908757dc160a038de7b77 (patch) | |
| tree | e81e49b1b8ee46a8f035121bbd7a5baebc11203c | |
| parent | 6fd0c721158b51690ca9e7e9d34b82ef7e0f03ff (diff) | |
| parent | 9ecee256f85022028f1b46477d0e49cd1dfeb4a4 (diff) | |
| download | CMake-e498dad3f274b9493ce908757dc160a038de7b77.zip CMake-e498dad3f274b9493ce908757dc160a038de7b77.tar.gz CMake-e498dad3f274b9493ce908757dc160a038de7b77.tar.bz2 | |
Merge branch 'revert-xcode-9-new-buildsystem-support' into release-3.9
Merge-request: !1183
| -rw-r--r-- | Help/release/3.9.rst | 7 | ||||
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 11 |
2 files changed, 5 insertions, 13 deletions
diff --git a/Help/release/3.9.rst b/Help/release/3.9.rst index 5087b43..897e268 100644 --- a/Help/release/3.9.rst +++ b/Help/release/3.9.rst @@ -34,8 +34,6 @@ Generators This is an experimental feature and can be activated by setting the :variable:`CMAKE_XCODE_GENERATE_SCHEME` variable to a ``TRUE`` value. -* The :generator:`Xcode` generator now supports Xcode 9. - Commands -------- @@ -337,3 +335,8 @@ Changes made since CMake 3.9.0 include the following. * On macOS, the default application bundle ``Info.plist`` file no longer enables Hi-DPI support as it did in 3.9.0 and 3.9.1. The change had to be reverted because it broke iOS applications. + +* The Xcode generator no longer adds "outputPaths" to custom script + build phases as it did in 3.9.0 and 3.9.1. This was added in an + attempt to support Xcode 9's new build system, but broke incremental + rebuilds for both the old and new Xcode build systems. diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 3cd14e1..9037961 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -1517,17 +1517,6 @@ void cmGlobalXCodeGenerator::AddCommandsToBuildPhase( makecmd += " all"; buildphase->AddAttribute("shellScript", this->CreateString(makecmd)); buildphase->AddAttribute("showEnvVarsInLog", this->CreateString("0")); - - cmXCodeObject* outputFiles = this->CreateObject(cmXCodeObject::OBJECT_LIST); - for (std::vector<cmCustomCommand>::const_iterator i = commands.begin(); - i != commands.end(); ++i) { - std::vector<std::string> const& outputs = i->GetOutputs(); - for (std::vector<std::string>::const_iterator j = outputs.begin(); - j != outputs.end(); ++j) { - outputFiles->AddObject(this->CreateString(*j)); - } - } - buildphase->AddAttribute("outputPaths", outputFiles); } void cmGlobalXCodeGenerator::CreateCustomRulesMakefile( |