diff options
author | Ken Martin <ken.martin@kitware.com> | 2005-05-09 19:11:51 (GMT) |
---|---|---|
committer | Ken Martin <ken.martin@kitware.com> | 2005-05-09 19:11:51 (GMT) |
commit | 52d9753f80c7a86df405634f4cfbba6930e1e63c (patch) | |
tree | 04eb1c86293665e188554f075b275c7448f6ec6f /Source/cmGlobalUnixMakefileGenerator3.cxx | |
parent | 5fb21a0640a91eb71d4c61db5708c49b6897d8fe (diff) | |
download | CMake-52d9753f80c7a86df405634f4cfbba6930e1e63c.zip CMake-52d9753f80c7a86df405634f4cfbba6930e1e63c.tar.gz CMake-52d9753f80c7a86df405634f4cfbba6930e1e63c.tar.bz2 |
ENH: some more fixes
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
-rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index bca095d..4661969 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -155,6 +155,8 @@ void cmGlobalUnixMakefileGenerator3::WriteMainMakefile() lg = static_cast<cmLocalUnixMakefileGenerator3 *>(m_LocalGenerators[i]); this->WriteConvenienceRules(makefileStream,lg); } + + lg->WriteSpecialTargetsBottom(makefileStream); } @@ -476,33 +478,6 @@ void cmGlobalUnixMakefileGenerator3 commands.clear(); commands.push_back(this->GetRecursiveMakeCall("clean.make",0)); lg->WriteMakeRule(makefileStream, "default clean target", "clean", depends, commands); - - - // Write special "cmake_check_build_system" target to run cmake with - // the --check-build-system flag. - // Build command to run CMake to check if anything needs regenerating. - std::string cmakefileName = this->GetCMakeInstance()->GetHomeOutputDirectory(); - cmakefileName += "/Makefile.cmake"; - std::string runRule = this->GetCMakeInstance()->GetCacheDefinition("CMAKE_COMMAND"); - runRule += " -H"; - runRule += this->GetCMakeInstance()->GetHomeDirectory(); - runRule += " -B"; - runRule += this->GetCMakeInstance()->GetHomeOutputDirectory(); - runRule += " --check-build-system "; - runRule += lg->ConvertToRelativeOutputPath(cmakefileName.c_str()); - - std::vector<std::string> no_depends; - commands.clear(); - commands.push_back(runRule); - lg->WriteMakeRule(makefileStream, - "Special rule to run CMake to check the build system " - "integrity.\n" - "No rule that depends on this can have " - "commands that come from listfiles\n" - "because they might be regenerated.", - "cmake_check_build_system", - no_depends, - commands); } |