diff options
| author | Michael Stürmer <michael.stuermer@schaeffler.com> | 2017-06-14 09:30:43 (GMT) |
|---|---|---|
| committer | Michael Stürmer <michael.stuermer@schaeffler.com> | 2017-06-16 07:33:06 (GMT) |
| commit | ec7b3af7e74defa608f4cb0debe329614c401635 (patch) | |
| tree | dc3c5a83d82800045e4cfe05c70b7fab32a4d6d9 /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | 22894747b423c7a634addd7ca80b73eb70947d88 (diff) | |
| download | CMake-ec7b3af7e74defa608f4cb0debe329614c401635.zip CMake-ec7b3af7e74defa608f4cb0debe329614c401635.tar.gz CMake-ec7b3af7e74defa608f4cb0debe329614c401635.tar.bz2 | |
Vs: remove /nowin32manifest from C# flags to enable default VS behavior
if /nowin32manifest is specified, it will be preferred over any occurring
/win32manifest:<file> parameter
Fixes: #16969, #16970
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 5a67477..d689dcf 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2340,6 +2340,12 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions( clOptions.AddFlag("CallingConvention", ""); } } + if (csproj == this->ProjectType) { + // /nowin32manifest overrides /win32manifest: parameter + if (clOptions.HasFlag("NoWin32Manifest")) { + clOptions.RemoveFlag("ApplicationManifest"); + } + } this->ClOptions[configName] = pOptions.release(); return true; |