diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2004-04-23 20:26:21 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2004-04-23 20:26:21 (GMT) |
| commit | 71b57bc4541b12bf874028f15e557c053e5b0b72 (patch) | |
| tree | 3419045422153b93b93042b13eca0f60c12edfc9 /Source | |
| parent | aff8c7bcd6fe751974c2e82147d1a29928236209 (diff) | |
| download | CMake-71b57bc4541b12bf874028f15e557c053e5b0b72.zip CMake-71b57bc4541b12bf874028f15e557c053e5b0b72.tar.gz CMake-71b57bc4541b12bf874028f15e557c053e5b0b72.tar.bz2 | |
BUG: fix for bug 769 CMAKE_STANDARD_LIBRARIES now used in ides
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalVisualStudio6Generator.cxx | 13 | ||||
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 4 |
2 files changed, 15 insertions, 2 deletions
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx index 544b09c..bc9fe68 100644 --- a/Source/cmLocalVisualStudio6Generator.cxx +++ b/Source/cmLocalVisualStudio6Generator.cxx @@ -955,7 +955,18 @@ void cmLocalVisualStudio6Generator::WriteDSPHeader(std::ostream& fout, const cha libMultiLineOptionsForDebug += extraLinkOptions; libMultiLineOptionsForDebug += " \n"; } - + if(const char* stdLibs = m_Makefile->GetDefinition("CMAKE_STANDARD_LIBRARIES")) + { + libOptions += " "; + libOptions += stdLibs; + libOptions += " "; + libMultiLineOptions += "# ADD LINK32 "; + libMultiLineOptions += stdLibs; + libMultiLineOptions += " \n"; + libMultiLineOptionsForDebug += "# ADD LINK32 "; + libMultiLineOptionsForDebug += stdLibs; + libMultiLineOptionsForDebug += " \n"; + } if(const char* targetLinkFlags = target.GetProperty("LINK_FLAGS")) { libOptions += " "; diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 4c9c238..7e526e1 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -617,7 +617,9 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout, extraLinkOptions.c_str()).c_str(); } fout << "\"\n" - << "\t\t\t\tAdditionalDependencies=\" odbc32.lib odbccp32.lib "; + << "\t\t\t\tAdditionalDependencies=\"" + << m_Makefile->GetDefinition("CMAKE_STANDARD_LIBRARIES") + << " "; this->OutputLibraries(fout, configName, libName, target); fout << "\"\n"; temp = m_ExecutableOutputPath; |