summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalVisualStudio6Generator.cxx
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2006-02-24 22:35:35 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2006-02-24 22:35:35 (GMT)
commitc4156b4531668adc0dc9bf37f42758d6db03ff68 (patch)
tree37762d0fda6dadd103b9b4dc2f08facd77cffc35 /Source/cmGlobalVisualStudio6Generator.cxx
parent46757656011165aa8c857523c8770cd0ea80c3da (diff)
downloadCMake-c4156b4531668adc0dc9bf37f42758d6db03ff68.zip
CMake-c4156b4531668adc0dc9bf37f42758d6db03ff68.tar.gz
CMake-c4156b4531668adc0dc9bf37f42758d6db03ff68.tar.bz2
COMP: Even more global target fixes
Diffstat (limited to 'Source/cmGlobalVisualStudio6Generator.cxx')
-rw-r--r--Source/cmGlobalVisualStudio6Generator.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index f720b1f..d24fd70 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -27,7 +27,6 @@ cmGlobalVisualStudio6Generator::cmGlobalVisualStudio6Generator()
void cmGlobalVisualStudio6Generator::EnableLanguage(std::vector<std::string>const& lang,
cmMakefile *mf)
{
- mf->AddDefinition("CMAKE_CFG_INTDIR","$(IntDir)");
mf->AddDefinition("CMAKE_GENERATOR_CC", "cl");
mf->AddDefinition("CMAKE_GENERATOR_CXX", "cl");
mf->AddDefinition("CMAKE_GENERATOR_RC", "rc");
@@ -246,7 +245,8 @@ void cmGlobalVisualStudio6Generator::WriteDSWFile(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());
}