summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalVisualStudio7Generator.cxx
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2006-02-24 21:20:44 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2006-02-24 21:20:44 (GMT)
commit07d0e776ad97d715b7ffa8484fc1da2deb9694dc (patch)
tree1fe319813f7a39799a93a3ac13a5f42d1906f93a /Source/cmGlobalVisualStudio7Generator.cxx
parent586a9427d3dd8b4a99f7a3d545814f8b9bf42453 (diff)
downloadCMake-07d0e776ad97d715b7ffa8484fc1da2deb9694dc.zip
CMake-07d0e776ad97d715b7ffa8484fc1da2deb9694dc.tar.gz
CMake-07d0e776ad97d715b7ffa8484fc1da2deb9694dc.tar.bz2
BUG: More fixing of support for global target son visual studio
Diffstat (limited to 'Source/cmGlobalVisualStudio7Generator.cxx')
-rw-r--r--Source/cmGlobalVisualStudio7Generator.cxx19
1 files changed, 2 insertions, 17 deletions
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 9fcedac..6d689f6 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -205,22 +205,6 @@ void cmGlobalVisualStudio7Generator::Generate()
"echo", "Build all projects");
std::string cmake_command =
m_LocalGenerators[0]->GetMakefile()->GetRequiredDefinition("CMAKE_COMMAND");
- gen[0]->GetMakefile()->
- AddUtilityCommand("INSTALL", false, no_output, no_depends,
- no_working_dir,
- cmake_command.c_str(),
- "-DBUILD_TYPE=$(OutDir)", "-P", "cmake_install.cmake");
-
- // Make the INSTALL target depend on ALL_BUILD unless the
- // project says to not do so.
- const char* noall =
- gen[0]->GetMakefile()
- ->GetDefinition("CMAKE_SKIP_INSTALL_ALL_DEPENDENCY");
- if(!noall || cmSystemTools::IsOff(noall))
- {
- cmTarget* install = gen[0]->GetMakefile()->FindTarget("INSTALL");
- install->AddUtility("ALL_BUILD");
- }
}
}
@@ -331,7 +315,8 @@ void cmGlobalVisualStudio7Generator::WriteSLNFile(std::ostream& fout,
{
if (al->second.IsInAll())
{
- if (al->second.GetType() == cmTarget::UTILITY)
+ if (al->second.GetType() == cmTarget::UTILITY &&
+ al->second.GetType() == cmTarget::GLOBAL_TARGET)
{
l->second.AddUtility(al->first.c_str());
}