diff options
| author | Brad King <brad.king@kitware.com> | 2018-04-27 12:23:56 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-04-27 12:24:06 (GMT) |
| commit | ea8189ee550683680fc243dc5a803dbc21529322 (patch) | |
| tree | fa9e0c932977f8f84189d1be9bfbbdf0ecfb0ea8 /Source | |
| parent | 48dcb2cacb3f20b1ad16899340c1c0e8ec6048c8 (diff) | |
| parent | 27b28c001fd96d4a967da3f65c7de9c2859f9b7b (diff) | |
| download | CMake-ea8189ee550683680fc243dc5a803dbc21529322.zip CMake-ea8189ee550683680fc243dc5a803dbc21529322.tar.gz CMake-ea8189ee550683680fc243dc5a803dbc21529322.tar.bz2 | |
Merge topic 'vs-managed-fastlink'
27b28c001f VS: Don't turn on /DEBUG:FASTLINK for managed C++ targets
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2011
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 5c3b134..262e8e8 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -3475,6 +3475,15 @@ bool cmVisualStudio10TargetGenerator::ComputeLinkOptions( } } + // Managed code cannot be linked with /DEBUG:FASTLINK + if (this->Managed) { + if (const char* debug = linkOptions.GetFlag("GenerateDebugInformation")) { + if (strcmp(debug, "DebugFastLink") == 0) { + linkOptions.AddFlag("GenerateDebugInformation", "Debug"); + } + } + } + this->LinkOptions[config] = std::move(pOptions); return true; } |