kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: minor cleanup and fix for convenience rules

Browse Source
This commit is contained in:
Ken Martin 2005-05-13 14:13:00 -04:00
parent 3744464c5e
commit 27ab533963
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Source/cmGlobalUnixMakefileGenerator3.cxx
View File

@ -509,26 +509,29 @@ cmGlobalUnixMakefileGenerator3
std::string makeTargetName; std::string makeTargetName;
depends.push_back("cmake_check_build_system"); depends.push_back("cmake_check_build_system");
std::string dir = lg->GetMakefile()->GetStartOutputDirectory(); if (lg->GetParent())
dir = lg->Convert(dir.c_str(),cmLocalGenerator::HOME_OUTPUT,cmLocalGenerator::MAKEFILE); {
localName = dir; std::string dir = lg->GetMakefile()->GetStartOutputDirectory();
localName += "/directory"; dir = lg->Convert(dir.c_str(),cmLocalGenerator::HOME_OUTPUT,cmLocalGenerator::MAKEFILE);
localName = dir;
localName += "/directory";
// write the directory rule // write the directory rule
commands.clear(); commands.clear();
makeTargetName = dir; makeTargetName = dir;
makeTargetName += "/depend"; makeTargetName += "/depend";
commands.push_back(lg->GetRecursiveMakeCall("depend.make",makeTargetName.c_str())); commands.push_back(lg->GetRecursiveMakeCall("depend.make",makeTargetName.c_str()));
makeTargetName = dir; makeTargetName = dir;
makeTargetName += "/requires"; makeTargetName += "/requires";
commands.push_back(lg->GetRecursiveMakeCall("depend.make",makeTargetName.c_str())); commands.push_back(lg->GetRecursiveMakeCall("depend.make",makeTargetName.c_str()));
makeTargetName = dir; makeTargetName = dir;
makeTargetName += "/build"; makeTargetName += "/build";
commands.push_back(lg->GetRecursiveMakeCall("build.make",makeTargetName.c_str())); commands.push_back(lg->GetRecursiveMakeCall("build.make",makeTargetName.c_str()));
// Write the rule. // Write the rule.
lg->WriteMakeRule(ruleFileStream, "Convenience name for target.", lg->WriteMakeRule(ruleFileStream, "Convenience name for directory.",
localName.c_str(), depends, commands); localName.c_str(), depends, commands);
}
// for each target Generate the rule files for each target. // for each target Generate the rule files for each target.
const cmTargets& targets = lg->GetMakefile()->GetTargets(); const cmTargets& targets = lg->GetMakefile()->GetTargets();