kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmMakefile: Return target from all AddUtilityCommand signatures

Browse Source
This commit is contained in:
Brad King 2015-07-29 10:41:30 -04:00
parent 98d6e9ec2d
commit aaa322a5cb
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Source/cmMakefile.cxx
View File

@ -1205,15 +1205,16 @@ cmMakefile::AddCustomCommandOldStyle(const std::string& target,
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmMakefile::AddUtilityCommand(const std::string& utilityName, cmTarget*
bool excludeFromAll, cmMakefile::AddUtilityCommand(const std::string& utilityName,
const std::vector<std::string>& depends, bool excludeFromAll,
const char* workingDirectory, const std::vector<std::string>& depends,
const char* command, const char* workingDirectory,
const char* arg1, const char* command,
const char* arg2, const char* arg1,
const char* arg3, const char* arg2,
const char* arg4) const char* arg3,
const char* arg4)
{ {
// Construct the command line for the custom command. // Construct the command line for the custom command.
cmCustomCommandLine commandLine; cmCustomCommandLine commandLine;
@ -1238,8 +1239,8 @@ void cmMakefile::AddUtilityCommand(const std::string& utilityName,
commandLines.push_back(commandLine); commandLines.push_back(commandLine);
// Call the real signature of this method. // Call the real signature of this method.
this->AddUtilityCommand(utilityName, excludeFromAll, workingDirectory, return this->AddUtilityCommand(utilityName, excludeFromAll, workingDirectory,
depends, commandLines); depends, commandLines);
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

17
Source/cmMakefile.h
View File

@ -194,14 +194,15 @@ public:
* Add a utility to the build. A utiltity target is a command that * Add a utility to the build. A utiltity target is a command that
* is run every time the target is built. * is run every time the target is built.
*/ */
void AddUtilityCommand(const std::string& utilityName, bool excludeFromAll, cmTarget* AddUtilityCommand(const std::string& utilityName,
const std::vector<std::string>& depends, bool excludeFromAll,
const char* workingDirectory, const std::vector<std::string>& depends,
const char* command, const char* workingDirectory,
const char* arg1=0, const char* command,
const char* arg2=0, const char* arg1=0,
const char* arg3=0, const char* arg2=0,
const char* arg4=0); const char* arg3=0,
const char* arg4=0);
cmTarget* AddUtilityCommand(const std::string& utilityName, cmTarget* AddUtilityCommand(const std::string& utilityName,
bool excludeFromAll, bool excludeFromAll,
const char* workingDirectory, const char* workingDirectory,