diff options
| author | Brad King <brad.king@kitware.com> | 2006-02-15 21:38:57 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2006-02-15 21:38:57 (GMT) |
| commit | 5288d61ede70fbe0944b1eff22eff11ae4f10a1a (patch) | |
| tree | f8ead10e9e2c871fa992534ea4b7b3dec70cec33 | |
| parent | 60cd72d01cf8f096a2d78e2ce608040fde14aa5b (diff) | |
| download | CMake-5288d61ede70fbe0944b1eff22eff11ae4f10a1a.zip CMake-5288d61ede70fbe0944b1eff22eff11ae4f10a1a.tar.gz CMake-5288d61ede70fbe0944b1eff22eff11ae4f10a1a.tar.bz2 | |
BUG: Use NOINHERIT macro to avoid linking to project default libraries which may not exist.
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 3fc9593..d05c19e 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -778,8 +778,10 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout, fout << " " << cmLocalVisualStudio7Generator::EscapeForXML( extraLinkOptions.c_str()).c_str(); } + // Use the NOINHERIT macro to avoid getting VS project default + // libraries which may be set by the user to something bad. fout << "\"\n" - << "\t\t\t\tAdditionalDependencies=\""; + << "\t\t\t\tAdditionalDependencies=\"$(NOINHERIT) "; this->OutputLibraries(fout, linkLibs); fout << "\"\n"; temp = m_LibraryOutputPath; @@ -846,8 +848,10 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout, fout << " " << cmLocalVisualStudio7Generator::EscapeForXML( extraLinkOptions.c_str()).c_str(); } + // Use the NOINHERIT macro to avoid getting VS project default + // libraries which may be set by the user to something bad. fout << "\"\n" - << "\t\t\t\tAdditionalDependencies=\"" + << "\t\t\t\tAdditionalDependencies=\"$(NOINHERIT) " << m_Makefile->GetRequiredDefinition("CMAKE_STANDARD_LIBRARIES") << " "; this->OutputLibraries(fout, linkLibs); |