diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2002-02-14 15:03:19 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2002-02-14 15:03:19 (GMT) |
| commit | 142119be9535ae1ef109595fdd83c0d929133834 (patch) | |
| tree | c73d2e08523c7f4479d5e94f57970e509a874fc1 | |
| parent | 2cc36654e65200fbd8c3b702cb449c95d0268a70 (diff) | |
| download | CMake-142119be9535ae1ef109595fdd83c0d929133834.zip CMake-142119be9535ae1ef109595fdd83c0d929133834.tar.gz CMake-142119be9535ae1ef109595fdd83c0d929133834.tar.bz2 | |
ENH: only depend subdir builds on TARGETS, not all sub dir operations, we do not want to build when doing a make depend
| -rw-r--r-- | Source/cmUnixMakefileGenerator.cxx | 15 | ||||
| -rw-r--r-- | Source/cmUnixMakefileGenerator.h | 1 |
2 files changed, 11 insertions, 5 deletions
diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx index 9be86b4..9e78f77 100644 --- a/Source/cmUnixMakefileGenerator.cxx +++ b/Source/cmUnixMakefileGenerator.cxx @@ -1108,8 +1108,13 @@ OutputSubDirectoryVars(std::ostream& fout, const char* target, const char* target1, const char* target2, + const char* depend, const std::vector<std::string>& SubDirectories) { + if(!depend) + { + depend = ""; + } if( SubDirectories.size() == 0) { return; @@ -1135,7 +1140,7 @@ OutputSubDirectoryVars(std::ostream& fout, for(unsigned int i =0; i < SubDirectories.size(); i++) { std::string subdir = FixDirectoryName(SubDirectories[i].c_str()); - fout << target << "_" << subdir.c_str() << ": $(TARGETS)"; + fout << target << "_" << subdir.c_str() << ": " << depend; // Make each subdirectory depend on previous one. This forces // parallel builds (make -j 2) to build in same order as a single @@ -1172,19 +1177,19 @@ void cmUnixMakefileGenerator::OutputSubDirectoryRules(std::ostream& fout) "SUBDIR_BUILD", "default_target", "default_target", - 0, + 0, "$(TARGETS)", SubDirectories); this->OutputSubDirectoryVars(fout, "SUBDIR_CLEAN", "clean", "clean", - 0, + 0, 0, SubDirectories); this->OutputSubDirectoryVars(fout, "SUBDIR_DEPEND", "depend", "depend", - 0, + 0, 0, SubDirectories); this->OutputSubDirectoryVars(fout, "SUBDIR_INSTALL", "install", "install", - 0, + 0, 0, SubDirectories); } diff --git a/Source/cmUnixMakefileGenerator.h b/Source/cmUnixMakefileGenerator.h index 236784c..14e6fc7 100644 --- a/Source/cmUnixMakefileGenerator.h +++ b/Source/cmUnixMakefileGenerator.h @@ -125,6 +125,7 @@ protected: const char* target, const char* target1, const char* target2, + const char* depend, const std::vector<std::string>& SubDirectories); virtual void OutputMakeRule(std::ostream&, |