diff options
author | Ken Martin <ken.martin@kitware.com> | 2005-07-28 13:14:42 (GMT) |
---|---|---|
committer | Ken Martin <ken.martin@kitware.com> | 2005-07-28 13:14:42 (GMT) |
commit | 825a762a302f7c9eb77f32adb858da4d4a2e97e0 (patch) | |
tree | 38fcfcaaae3480b2ae74f463c4a23d131f0f17de /Source/cmLocalUnixMakefileGenerator3.cxx | |
parent | 68737734876770ddacb817e07d2c63e61b42a34b (diff) | |
download | CMake-825a762a302f7c9eb77f32adb858da4d4a2e97e0.zip CMake-825a762a302f7c9eb77f32adb858da4d4a2e97e0.tar.gz CMake-825a762a302f7c9eb77f32adb858da4d4a2e97e0.tar.bz2 |
ENH: always write out all custom commands
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
-rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index fde40bc..1ccb61c 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -92,22 +92,6 @@ void cmLocalUnixMakefileGenerator3::Generate() // Write the cmake file with information for this directory. this->WriteDirectoryInformationFile(); - - // all custom commands used? - const std::vector<cmSourceFile*> &srcs = m_Makefile->GetSourceFiles(); - std::vector<cmSourceFile*>::const_iterator sit = srcs.begin(); - for (;sit != srcs.end(); ++sit) - { - if ((*sit)->GetCustomCommand() && !(*sit)->GetCustomCommand()->IsUsed()) - { - cmOStringStream err; - err << "Warning: Custom command for source file " - << (*sit)->GetSourceName().c_str() << "." - << (*sit)->GetSourceExtension().c_str() - << " was not used."; - cmSystemTools::Message(err.str().c_str(), "Warning"); - } - } } @@ -163,23 +147,17 @@ void cmLocalUnixMakefileGenerator3 ::WriteCustomCommands(cmTarget &target,std::ostream& ruleFileStream, std::vector<std::string>& cleanFiles) { - std::string tgtDir = m_Makefile->GetStartOutputDirectory(); - tgtDir += "/"; - tgtDir += this->GetTargetDirectory(target); - // add custom commands to the clean rules? const char* clean_no_custom = m_Makefile->GetProperty("CLEAN_NO_CUSTOM"); bool clean = cmSystemTools::IsOff(clean_no_custom); // Generate the rule files for each custom command. - // get the classes from the source lists then add them to the groups - const std::vector<cmSourceFile*> &classes = target.GetSourceFiles(); + const std::vector<cmSourceFile*> &classes = m_Makefile->GetSourceFiles(); for(std::vector<cmSourceFile*>::const_iterator i = classes.begin(); i != classes.end(); i++) { if(cmCustomCommand* cc = (*i)->GetCustomCommand()) { - cc->Used(); this->GenerateCustomRuleFile(*cc,ruleFileStream); if (clean) { |