diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2005-05-12 20:25:40 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2005-05-12 20:25:40 (GMT) |
| commit | bbdfcc581aeea7bf087e30102a934d62c4a15f48 (patch) | |
| tree | 36fa5bd0f24c5f7e9567b5e94977cff92eb155ab | |
| parent | 70ed04df052ac8fa6d567778598eee0f407f313c (diff) | |
| download | CMake-bbdfcc581aeea7bf087e30102a934d62c4a15f48.zip CMake-bbdfcc581aeea7bf087e30102a934d62c4a15f48.tar.gz CMake-bbdfcc581aeea7bf087e30102a934d62c4a15f48.tar.bz2 | |
Undo fix as it broke the dashboard
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index b3af98b..f92bbb0 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -573,9 +573,9 @@ void cmLocalVisualStudio7Generator::FillFlagMapFromCommandFlags( void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout, - const char* configName, - const char *libName, - const cmTarget &target) + const char* configName, + const char *libName, + const cmTarget &target) { std::string temp; std::string debugPostfix = ""; @@ -586,27 +586,17 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout, } std::string extraLinkOptions; - std::string flagVar; if(target.GetType() == cmTarget::EXECUTABLE) { - flagVar = "CMAKE_EXE_LINKER_FLAGS"; + extraLinkOptions = m_Makefile->GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS"); } if(target.GetType() == cmTarget::SHARED_LIBRARY) { - flagVar = "CMAKE_SHARED_LINKER_FLAGS"; + extraLinkOptions = m_Makefile->GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS"); } if(target.GetType() == cmTarget::MODULE_LIBRARY) { - flagVar = "CMAKE_MODULE_LINKER_FLAGS"; - } - extraLinkOptions = m_Makefile->GetRequiredDefinition(flagVar.c_str()); - // Now add _DEBUG, _RELEASE, etc version of flagVar - if(configName) - { - flagVar += "_"; - flagVar += cmSystemTools::UpperCase(std::string(configName)); - extraLinkOptions += " "; - extraLinkOptions += m_Makefile->GetRequiredDefinition(flagVar.c_str()); + extraLinkOptions = m_Makefile->GetRequiredDefinition("CMAKE_MODULE_LINKER_FLAGS"); } const char* targetLinkFlags = target.GetProperty("LINK_FLAGS"); |