reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-12-02 08:37:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Makefile: Allow adding post-build rules to object libraries

Browse Source
This commit is contained in:
Gregor Jasny 2017-02-18 20:12:27 +01:00
parent 96b6afdc42
commit 33a1d727d5
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmGlobalXCodeGenerator.cxx
View File

@ -489,7 +489,8 @@ void cmGlobalXCodeGenerator::AddExtraTargets(
std::vector<std::string> no_byproducts; std::vector<std::string> no_byproducts;
lg->GetMakefile()->AddCustomCommandToTarget( lg->GetMakefile()->AddCustomCommandToTarget(
target->GetName(), no_byproducts, no_depends, commandLines, target->GetName(), no_byproducts, no_depends, commandLines,
cmTarget::POST_BUILD, "Depend check for xcode", dir.c_str()); cmTarget::POST_BUILD, "Depend check for xcode", dir.c_str(), true,
false, "", false, cmMakefile::AcceptObjectLibraryCommands);
} }
if (target->GetType() != cmStateEnums::INTERFACE_LIBRARY && if (target->GetType() != cmStateEnums::INTERFACE_LIBRARY &&

6
Source/cmMakefile.cxx
View File

@ -684,7 +684,8 @@ void cmMakefile::AddCustomCommandToTarget(
const std::vector<std::string>& depends, const std::vector<std::string>& depends,
const cmCustomCommandLines& commandLines, cmTarget::CustomCommandType type, const cmCustomCommandLines& commandLines, cmTarget::CustomCommandType type,
const char* comment, const char* workingDir, bool escapeOldStyle, 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. // Find the target to which to add the custom command.
cmTargets::iterator ti = this->Targets.find(target); cmTargets::iterator ti = this->Targets.find(target);
@ -724,7 +725,8 @@ void cmMakefile::AddCustomCommandToTarget(
return; return;
} }
if (ti->second.GetType() == cmStateEnums::OBJECT_LIBRARY) { if (objLibraryCommands == RejectObjectLibraryCommands &&
ti->second.GetType() == cmStateEnums::OBJECT_LIBRARY) {
std::ostringstream e; std::ostringstream e;
e << "Target \"" << target e << "Target \"" << target
<< "\" is an OBJECT library " << "\" is an OBJECT library "

10
Source/cmMakefile.h
View File

@ -119,6 +119,13 @@ public:
*/ */
void FinalPass(); void FinalPass();
/** How to handle custom commands for object libraries */
enum ObjectLibraryCommands
{
RejectObjectLibraryCommands,
AcceptObjectLibraryCommands
};
/** Add a custom command to the build. */ /** Add a custom command to the build. */
void AddCustomCommandToTarget( void AddCustomCommandToTarget(
const std::string& target, const std::vector<std::string>& byproducts, const std::string& target, const std::vector<std::string>& byproducts,
@ -126,7 +133,8 @@ public:
const cmCustomCommandLines& commandLines, cmTarget::CustomCommandType type, const cmCustomCommandLines& commandLines, cmTarget::CustomCommandType type,
const char* comment, const char* workingDir, bool escapeOldStyle = true, const char* comment, const char* workingDir, bool escapeOldStyle = true,
bool uses_terminal = false, const std::string& depfile = "", bool uses_terminal = false, const std::string& depfile = "",
bool command_expand_lists = false); bool command_expand_lists = false,
ObjectLibraryCommands objLibraryCommands = RejectObjectLibraryCommands);
cmSourceFile* AddCustomCommandToOutput( cmSourceFile* AddCustomCommandToOutput(
const std::vector<std::string>& outputs, const std::vector<std::string>& outputs,
const std::vector<std::string>& byproducts, const std::vector<std::string>& byproducts,