diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-24 14:31:39 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-02-24 14:31:39 (GMT) |
| commit | 32f13fbe09fc8a5814bb3137abf2158cf1e24807 (patch) | |
| tree | d998e97679fd0dad5dd7c77b6d96ae637e144957 /Source/cmMakefile.cxx | |
| parent | 58ec4932e348814d70d70f7e60ad0c2fcb2240f7 (diff) | |
| parent | 624021a09e7850b1f6cb75af40b17a38d98c95e3 (diff) | |
| download | CMake-32f13fbe09fc8a5814bb3137abf2158cf1e24807.zip CMake-32f13fbe09fc8a5814bb3137abf2158cf1e24807.tar.gz CMake-32f13fbe09fc8a5814bb3137abf2158cf1e24807.tar.bz2 | |
Merge topic '16615-xcode-object-libraries-depends'
624021a0 Add test for object library dependencies
5da9266a Xcode: Always track object library dependencies via hacky Makefile
e80ac953 Xcode: Record dependency information also for object libraries
9293e57d Xcode: Collect dummy rules during iteration and emit afterwards
33a1d727 Makefile: Allow adding post-build rules to object libraries
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index b3d7a04..c75d101 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -684,7 +684,8 @@ void cmMakefile::AddCustomCommandToTarget( const std::vector<std::string>& depends, const cmCustomCommandLines& commandLines, cmTarget::CustomCommandType type, const char* comment, const char* workingDir, bool escapeOldStyle, - bool uses_terminal, const std::string& depfile, bool command_expand_lists) + bool uses_terminal, const std::string& depfile, bool command_expand_lists, + ObjectLibraryCommands objLibraryCommands) { // Find the target to which to add the custom command. cmTargets::iterator ti = this->Targets.find(target); @@ -724,7 +725,8 @@ void cmMakefile::AddCustomCommandToTarget( return; } - if (ti->second.GetType() == cmStateEnums::OBJECT_LIBRARY) { + if (objLibraryCommands == RejectObjectLibraryCommands && + ti->second.GetType() == cmStateEnums::OBJECT_LIBRARY) { std::ostringstream e; e << "Target \"" << target << "\" is an OBJECT library " |