diff options
author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-02-24 21:20:44 (GMT) |
---|---|---|
committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-02-24 21:20:44 (GMT) |
commit | 07d0e776ad97d715b7ffa8484fc1da2deb9694dc (patch) | |
tree | 1fe319813f7a39799a93a3ac13a5f42d1906f93a /Source/cmLocalVisualStudio7Generator.cxx | |
parent | 586a9427d3dd8b4a99f7a3d545814f8b9bf42453 (diff) | |
download | CMake-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/cmLocalVisualStudio7Generator.cxx')
-rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 7d76391..ac55eac 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -162,11 +162,6 @@ void cmLocalVisualStudio7Generator::OutputVCProjFile() && (l->second.GetType() != cmTarget::INSTALL_PROGRAMS) && (strncmp(l->first.c_str(), "INCLUDE_EXTERNAL_MSPROJECT", 26) != 0) && (strcmp(l->first.c_str(), "ALL_BUILD") != 0) - && (strcmp(l->first.c_str(), "RUN_TESTS") != 0) - && (strcmp(l->first.c_str(), "EDIT_CACHE") != 0) - && (strcmp(l->first.c_str(), "REBUILD_CACHE") != 0) - && (strcmp(l->first.c_str(), "PACKAGE") != 0) - && (strcmp(l->first.c_str(), "INSTALL") != 0) && (strcmp(l->first.c_str(), CMAKE_CHECK_BUILD_SYSTEM_TARGET) != 0)) { cmTarget& target = l->second; @@ -435,6 +430,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout, configType = "1"; break; case cmTarget::UTILITY: + case cmTarget::GLOBAL_TARGET: configType = "10"; default: break; @@ -859,6 +855,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout, break; } case cmTarget::UTILITY: + case cmTarget::GLOBAL_TARGET: break; } } @@ -1070,7 +1067,8 @@ void cmLocalVisualStudio7Generator::WriteGroup(const cmSourceGroup *sg, cmTarget } } } - if (source != libName || target.GetType() == cmTarget::UTILITY) + if (source != libName || target.GetType() == cmTarget::UTILITY || + target.GetType() == cmTarget::GLOBAL_TARGET ) { fout << "\t\t\t<File\n"; std::string d = this->ConvertToXMLOutputPathSingle(source.c_str()); @@ -1222,7 +1220,8 @@ void cmLocalVisualStudio7Generator::OutputTargetRules(std::ostream& fout, cmTarget &target, const char * /*libName*/) { - if (target.GetType() > cmTarget::UTILITY) + if (target.GetType() > cmTarget::UTILITY || + target.GetType() > cmTarget::GLOBAL_TARGET) { return; } |