summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalVisualStudio6Generator.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/cmLocalVisualStudio6Generator.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/cmLocalVisualStudio6Generator.cxx')
-rw-r--r--Source/cmLocalVisualStudio6Generator.cxx10
1 files changed, 7 insertions, 3 deletions
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 804a87c..d7533b9 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -183,6 +183,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
this->SetBuildType(EXECUTABLE,l->first.c_str(), l->second);
break;
case cmTarget::UTILITY:
+ case cmTarget::GLOBAL_TARGET:
this->SetBuildType(UTILITY, l->first.c_str(), l->second);
break;
case cmTarget::INSTALL_FILES:
@@ -309,7 +310,8 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
// special care for dependencies. The first rule must depend on all
// the dependencies of all the rules. The later rules must each
// depend only on the previous rule.
- if (target.GetType() == cmTarget::UTILITY &&
+ if ((target.GetType() == cmTarget::UTILITY ||
+ target.GetType() == cmTarget::GLOBAL_TARGET) &&
(!target.GetPreBuildCommands().empty() ||
!target.GetPostBuildCommands().empty()))
{
@@ -453,7 +455,8 @@ void cmLocalVisualStudio6Generator::WriteGroup(const cmSourceGroup *sg, cmTarget
{
cmSystemTools::ExpandListArgument(dependsValue, depends);
}
- if (source != libName || target.GetType() == cmTarget::UTILITY)
+ if (source != libName || target.GetType() == cmTarget::UTILITY
+ || target.GetType() == cmTarget::GLOBAL_TARGET)
{
fout << "# Begin Source File\n\n";
@@ -718,7 +721,8 @@ cmLocalVisualStudio6Generator::CreateTargetRules(cmTarget &target,
{
std::string customRuleCode = "";
- if (target.GetType() >= cmTarget::UTILITY)
+ if (target.GetType() >= cmTarget::UTILITY ||
+ target.GetType() >= cmTarget::GLOBAL_TARGET)
{
return customRuleCode;
}