diff options
| author | Brad King <brad.king@kitware.com> | 2017-07-17 14:26:21 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-07-17 14:26:37 (GMT) |
| commit | 8ff5aeb7cb7004e48a3cb2f3524b368b77db3075 (patch) | |
| tree | 0ec577b69e131ea1b957bf0a8a70bf5525d66bcb | |
| parent | 3ce57e3b546cb1f7aec43717ff239cd72428cc5a (diff) | |
| parent | 0348383b8ccb943a68cda3ecf1bdd609212ff5ca (diff) | |
| download | CMake-8ff5aeb7cb7004e48a3cb2f3524b368b77db3075.zip CMake-8ff5aeb7cb7004e48a3cb2f3524b368b77db3075.tar.gz CMake-8ff5aeb7cb7004e48a3cb2f3524b368b77db3075.tar.bz2 | |
Merge topic 'xcode9support'
0348383b Xcode: Add "outputPaths" to custom command script build phase
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1054
| -rw-r--r-- | Help/release/3.9.rst | 2 | ||||
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/Help/release/3.9.rst b/Help/release/3.9.rst index c31f533..f8735a8 100644 --- a/Help/release/3.9.rst +++ b/Help/release/3.9.rst @@ -34,6 +34,8 @@ 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 -------- diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 4be3c80..071d49c 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -1517,6 +1517,17 @@ 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( |