summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalUnixMakefileGenerator3.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2006-06-01 18:43:28 (GMT)
committerBrad King <brad.king@kitware.com>2006-06-01 18:43:28 (GMT)
commitad9dd6d11c06e5e180efad391717b985b3818cfb (patch)
tree3a7ba7b57be27a2cf626f28275448f9d2de9a8b8 /Source/cmGlobalUnixMakefileGenerator3.cxx
parent791706a52f68f8750026682a4a5ae4f49b62df68 (diff)
downloadCMake-ad9dd6d11c06e5e180efad391717b985b3818cfb.zip
CMake-ad9dd6d11c06e5e180efad391717b985b3818cfb.tar.gz
CMake-ad9dd6d11c06e5e180efad391717b985b3818cfb.tar.bz2
ENH: Moved generation of the /fast version of GLOBAL_TARGET targets to the proper place in the local generator instead of in the global generator. Also made the install/fast target not depend on the all target.
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
-rw-r--r--Source/cmGlobalUnixMakefileGenerator3.cxx14
1 files changed, 2 insertions, 12 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 98caec2..ac9e5b9 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -686,6 +686,8 @@ cmGlobalUnixMakefileGenerator3
strlen(t->second.GetName()) &&
emitted.insert(t->second.GetName()).second)
{
+ // Handle user targets here. Global targets are handled in
+ // the local generator on a per-directory basis.
if((t->second.GetType() == cmTarget::EXECUTABLE) ||
(t->second.GetType() == cmTarget::STATIC_LIBRARY) ||
(t->second.GetType() == cmTarget::SHARED_LIBRARY) ||
@@ -762,18 +764,6 @@ cmGlobalUnixMakefileGenerator3
lg->WriteMakeRule(ruleFileStream, "fast build rule for target.",
localName.c_str(), depends, commands, true);
}
- else if(t->second.GetType() == cmTarget::GLOBAL_TARGET)
- {
- // Provide a fast target for the global targets that just
- // forwards to the real target so at least it will work.
- depends.clear();
- commands.clear();
- std::string localName = t->second.GetName();
- depends.push_back(localName);
- localName += "/fast";
- lg->WriteMakeRule(ruleFileStream, "fast build rule for target.",
- localName.c_str(), depends, commands, true);
- }
}
}
}