diff options
| author | Ken Martin <ken.martin@kitware.com> | 2005-05-09 12:53:38 (GMT) |
|---|---|---|
| committer | Ken Martin <ken.martin@kitware.com> | 2005-05-09 12:53:38 (GMT) |
| commit | 5fb21a0640a91eb71d4c61db5708c49b6897d8fe (patch) | |
| tree | 5c4986d9e18fd2914e624763cfbe96fa836ee873 | |
| parent | 20f668c6fe9b33f0eefc2cff44c6e3a6f9906b91 (diff) | |
| download | CMake-5fb21a0640a91eb71d4c61db5708c49b6897d8fe.zip CMake-5fb21a0640a91eb71d4c61db5708c49b6897d8fe.tar.gz CMake-5fb21a0640a91eb71d4c61db5708c49b6897d8fe.tar.bz2 | |
ENH: some more cleanup
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 16 | ||||
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.h | 5 |
2 files changed, 12 insertions, 9 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 43dd5c1..07ea08a 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -868,7 +868,7 @@ cmLocalUnixMakefileGenerator3 std::auto_ptr<cmDepends> checker(this->GetDependsChecker(lang, m_Makefile->GetStartOutputDirectory(), - objFile)); + objFile, false)); if(checker.get()) { // Save the make and mark file names. @@ -2713,20 +2713,21 @@ cmLocalUnixMakefileGenerator3 cmDepends* cmLocalUnixMakefileGenerator3::GetDependsChecker(const std::string& lang, const char* dir, - const char* objFile) + const char* objFile, + bool verbose) { if(lang == "C" || lang == "CXX" || lang == "RC") { - return new cmDependsC(dir, objFile); + return new cmDependsC(dir, objFile, verbose); } #ifdef CMAKE_BUILD_WITH_CMAKE else if(lang == "Fortran") { - return new cmDependsFortran(dir, objFile); + return new cmDependsFortran(dir, objFile, verbose); } else if(lang == "Java") { - return new cmDependsJava(dir, objFile); + return new cmDependsJava(dir, objFile, verbose); } #endif return 0; @@ -2834,7 +2835,8 @@ cmLocalUnixMakefileGenerator3 } //---------------------------------------------------------------------------- -void cmLocalUnixMakefileGenerator3::CheckDependencies(cmMakefile* mf) +void cmLocalUnixMakefileGenerator3::CheckDependencies(cmMakefile* mf, + bool verbose) { // Get the list of languages that may have sources to check. const char* langDef = mf->GetDefinition("CMAKE_DEPENDS_LANGUAGES"); @@ -2863,7 +2865,7 @@ void cmLocalUnixMakefileGenerator3::CheckDependencies(cmMakefile* mf) // Construct a checker for the given language. std::auto_ptr<cmDepends> checker(cmLocalUnixMakefileGenerator3 - ::GetDependsChecker(*l, ".", f->c_str())); + ::GetDependsChecker(*l, ".", f->c_str(), verbose)); if(checker.get()) { checker->Check(); diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h index 163323a..ac4c04b 100644 --- a/Source/cmLocalUnixMakefileGenerator3.h +++ b/Source/cmLocalUnixMakefileGenerator3.h @@ -119,7 +119,7 @@ public: static bool ScanDependencies(std::vector<std::string> const& args); /** Called from command-line hook to check dependencies. */ - static void CheckDependencies(cmMakefile* mf); + static void CheckDependencies(cmMakefile* mf, bool verbose); /** write some extra rules suahc as make test etc */ void WriteSpecialTargetsTop(std::ostream& makefileStream); @@ -200,7 +200,8 @@ protected: // return the appropriate depends checker static cmDepends* GetDependsChecker(const std::string& lang, const char* dir, - const char* objFile); + const char* objFile, + bool verbose); void GenerateCustomRuleFile(const cmCustomCommand& cc); |