diff options
author | Ken Martin <ken.martin@kitware.com> | 2007-03-13 19:18:27 (GMT) |
---|---|---|
committer | Ken Martin <ken.martin@kitware.com> | 2007-03-13 19:18:27 (GMT) |
commit | c53b26baf26bdb465fbbe003b9e184b66ee22d7a (patch) | |
tree | 0146deb8afa5277002a511f1a519477d1f2035e7 /Source/cmMakefile.cxx | |
parent | 5891ba16ce5cec9ed81468da4d07f1513de756ee (diff) | |
download | CMake-c53b26baf26bdb465fbbe003b9e184b66ee22d7a.zip CMake-c53b26baf26bdb465fbbe003b9e184b66ee22d7a.tar.gz CMake-c53b26baf26bdb465fbbe003b9e184b66ee22d7a.tar.bz2 |
ENH: some more cleanup
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r-- | Source/cmMakefile.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 83b9d14..1679568 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -771,7 +771,8 @@ cmMakefile::AddCustomCommandOldStyle(const char* target, } //---------------------------------------------------------------------------- -void cmMakefile::AddUtilityCommand(const char* utilityName, bool all, +void cmMakefile::AddUtilityCommand(const char* utilityName, + bool excludeFromAll, const std::vector<std::string>& depends, const char* workingDirectory, const char* command, @@ -803,12 +804,13 @@ void cmMakefile::AddUtilityCommand(const char* utilityName, bool all, commandLines.push_back(commandLine); // Call the real signature of this method. - this->AddUtilityCommand(utilityName, all, workingDirectory, + this->AddUtilityCommand(utilityName, excludeFromAll, workingDirectory, depends, commandLines); } //---------------------------------------------------------------------------- -void cmMakefile::AddUtilityCommand(const char* utilityName, bool all, +void cmMakefile::AddUtilityCommand(const char* utilityName, + bool excludeFromAll, const char* workingDirectory, const std::vector<std::string>& depends, const cmCustomCommandLines& commandLines, @@ -818,8 +820,10 @@ void cmMakefile::AddUtilityCommand(const char* utilityName, bool all, cmTarget target; target.SetMakefile(this); target.SetType(cmTarget::UTILITY, utilityName); - target.SetProperty("EXCLUDE_FROM_ALL", (all) ?"FALSE" : "TRUE"); - + if (excludeFromAll) + { + target.SetProperty("EXCLUDE_FROM_ALL", "TRUE"); + } if(!comment) { // Use an empty comment to avoid generation of default comment. |