summaryrefslogtreecommitdiffstats
path: root/Source/cmVisualStudio10TargetGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2009-09-29 20:38:43 (GMT)
committerBrad King <brad.king@kitware.com>2009-09-29 20:38:43 (GMT)
commitcaee3af3c5625d1a181c90efdff6fb599f21f699 (patch)
tree2cef1cb7ab61a4e0bdba6c65e14d39662d4bbda4 /Source/cmVisualStudio10TargetGenerator.cxx
parentd6b47bee79175c33fa3992e4494c604fc6d71558 (diff)
downloadCMake-caee3af3c5625d1a181c90efdff6fb599f21f699.zip
CMake-caee3af3c5625d1a181c90efdff6fb599f21f699.tar.gz
CMake-caee3af3c5625d1a181c90efdff6fb599f21f699.tar.bz2
Do not parse preprocessor defs for VS 10 link/lib
When constructing cmVisualStudioGeneratorOptions to parse options for tools 'link' and 'lib' the tool type is now Linker, not Compiler. This tells it not to recognize flags starting in '/D' as preprocessor macros, such as the '/DEF:<file>' linker option. See issue #9613.
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 21c0095..b7991b6 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -951,10 +951,10 @@ void cmVisualStudio10TargetGenerator::WriteLibOptions(std::string const&
->GetProperty("STATIC_LIBRARY_FLAGS"))
{
this->WriteString("<Lib>\n", 2);
- cmVisualStudioGeneratorOptions
- libOptions(this->LocalGenerator,
- 10, cmVisualStudioGeneratorOptions::Compiler,
- cmVS10LibFlagTable, 0, this);
+ cmVisualStudioGeneratorOptions
+ libOptions(this->LocalGenerator, 10,
+ cmVisualStudioGeneratorOptions::Linker,
+ cmVS10LibFlagTable, 0, this);
libOptions.Parse(libflags);
libOptions.OutputAdditionalOptions(*this->BuildFileStream, " ", "");
libOptions.OutputFlagMap(*this->BuildFileStream, " ");
@@ -1023,10 +1023,10 @@ void cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const&
flags += " ";
flags += targetLinkFlags;
}
- cmVisualStudioGeneratorOptions
- linkOptions(this->LocalGenerator,
- 10, cmVisualStudioGeneratorOptions::Compiler,
- cmVS10LinkFlagTable);
+ cmVisualStudioGeneratorOptions
+ linkOptions(this->LocalGenerator, 10,
+ cmVisualStudioGeneratorOptions::Linker,
+ cmVS10LinkFlagTable, 0, this);
if ( this->Target->GetPropertyAsBool("WIN32_EXECUTABLE") )
{
flags += " /SUBSYSTEM:WINDOWS";