summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalVisualStudio7Generator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2007-04-10 17:09:03 (GMT)
committerBrad King <brad.king@kitware.com>2007-04-10 17:09:03 (GMT)
commit996f3915938f7c46081f42b5ae1407abd4aede02 (patch)
treeef2111622a4e941e7f0bd7bb6971d7060ff98e9d /Source/cmGlobalVisualStudio7Generator.cxx
parenta017333d9a7c58e573a4a0ba98fed62909832445 (diff)
downloadCMake-996f3915938f7c46081f42b5ae1407abd4aede02.zip
CMake-996f3915938f7c46081f42b5ae1407abd4aede02.tar.gz
CMake-996f3915938f7c46081f42b5ae1407abd4aede02.tar.bz2
BUG: The ALL_BUILD target should not have any command lines so that it is not always considered out of date. Moved the 'Build all projects' message into the description field instead of an echo in the command field. Moved common implementation of Generate for VS6 and VS7 into the superclass to avoid duplicate code for the ALL_BUILD target. This addresses bug#4556.
Diffstat (limited to 'Source/cmGlobalVisualStudio7Generator.cxx')
-rw-r--r--Source/cmGlobalVisualStudio7Generator.cxx28
1 files changed, 2 insertions, 26 deletions
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index cdee3bb..afe96e7 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -214,33 +214,9 @@ void cmGlobalVisualStudio7Generator::GenerateConfigurations(cmMakefile* mf)
void cmGlobalVisualStudio7Generator::Generate()
{
- // add a special target that depends on ALL projects for easy build
- // of one configuration only.
- const char* no_working_dir = 0;
- std::vector<std::string> no_depends;
- std::map<cmStdString, std::vector<cmLocalGenerator*> >::iterator it;
- for(it = this->ProjectMap.begin(); it!= this->ProjectMap.end(); ++it)
- {
- std::vector<cmLocalGenerator*>& gen = it->second;
- // add the ALL_BUILD to the first local generator of each project
- if(gen.size())
- {
- gen[0]->GetMakefile()->
- AddUtilityCommand("ALL_BUILD", true, no_depends,
- no_working_dir,
- "echo", "Build all projects");
- std::string cmake_command =
- this->LocalGenerators[0]->GetMakefile()->
- GetRequiredDefinition("CMAKE_COMMAND");
- }
- }
-
- // Fix utility dependencies to avoid linking to libraries.
- this->FixUtilityDepends();
-
// first do the superclass method
- this->cmGlobalGenerator::Generate();
-
+ this->cmGlobalVisualStudioGenerator::Generate();
+
// Now write out the DSW
this->OutputSLNFile();
}