[Cmake-commits] CMake branch, master, updated. v3.9.1-588-g53305ce

Kitware Robot kwrobot at kitware.com
Fri Aug 25 11:15:02 EDT 2017


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  53305ce5b067c4feaa91ffe0cc82b740af525b3f (commit)
       via  9ecee256f85022028f1b46477d0e49cd1dfeb4a4 (commit)
      from  a749fcb3d0f788b85be0531ffe7e7ec2aaf7f9fa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53305ce5b067c4feaa91ffe0cc82b740af525b3f
commit 53305ce5b067c4feaa91ffe0cc82b740af525b3f
Merge: a749fcb 9ecee25
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 25 15:03:30 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Aug 25 11:05:05 2017 -0400

    Merge topic 'revert-xcode-9-new-buildsystem-support'
    
    9ecee256 Xcode: Revert addition of "outputPaths" to custom command build phase
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1183


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ecee256f85022028f1b46477d0e49cd1dfeb4a4
commit 9ecee256f85022028f1b46477d0e49cd1dfeb4a4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 24 10:50:28 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 24 10:56:48 2017 -0400

    Xcode: Revert addition of "outputPaths" to custom command build phase
    
    The change in commit v3.9.0~3^2 (Xcode: Add "outputPaths" to custom
    command script build phase, 2017-07-13) was meant to support Xcode 9's
    new build system.  However, without matching "inputPaths", Xcode will
    not re-run the build phase if its outputs have already been generated.
    This broke the old Xcode build system too.
    
    Revert the change for now so at least the old Xcode build system works.
    Further investigation will be needed to add proper support for Xcode 9's
    new build system.
    
    Fixes: #17178

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(

-----------------------------------------------------------------------

Summary of changes:
 Help/release/3.9.rst              |    7 +++++--
 Source/cmGlobalXCodeGenerator.cxx |   11 -----------
 2 files changed, 5 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list