summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalVisualStudio6Generator.cxx
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2002-12-05 18:44:11 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2002-12-05 18:44:11 (GMT)
commit96189f79d582f90758ba1b4f691031b1d7fa02f3 (patch)
tree36bc488b7a77d01a9b9be3b1e4b0ab8963378fdc /Source/cmLocalVisualStudio6Generator.cxx
parent8d20322160e6e8c7bf9c6d69de9319f57373de5d (diff)
downloadCMake-96189f79d582f90758ba1b4f691031b1d7fa02f3.zip
CMake-96189f79d582f90758ba1b4f691031b1d7fa02f3.tar.gz
CMake-96189f79d582f90758ba1b4f691031b1d7fa02f3.tar.bz2
ENH: unify EnableLanguage across all generators
Diffstat (limited to 'Source/cmLocalVisualStudio6Generator.cxx')
-rw-r--r--Source/cmLocalVisualStudio6Generator.cxx12
1 files changed, 10 insertions, 2 deletions
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 3c4a640..9ec0ece 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -737,8 +737,16 @@ void cmLocalVisualStudio6Generator::WriteDSPHeader(std::ostream& fout, const cha
}
}
}
- std::string extraLinkOptions =
- m_Makefile->GetDefinition("CMAKE_EXTRA_LINK_FLAGS");
+ std::string extraLinkOptions;
+ if(target.GetType() == cmTarget::EXECUTABLE)
+ {
+ extraLinkOptions = m_Makefile->GetDefinition("CMAKE_EXE_LINKER_FLAGS");
+ }
+ if(target.GetType() == cmTarget::SHARED_LIBRARY)
+ {
+ extraLinkOptions = m_Makefile->GetDefinition("CMAKE_SHARED_LINKER_FLAGS");
+ }
+
if(extraLinkOptions.size())
{
libOptions += " ";