summaryrefslogtreecommitdiffstats
path: root/Source/cmVisualStudio10TargetGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-09-19 12:24:28 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-09-19 12:25:22 (GMT)
commit8fee054ecaf039d4253a2e9cfeafb3c154704808 (patch)
tree9c612d30017ca722757db6bfdb56cad47cfc87c1 /Source/cmVisualStudio10TargetGenerator.cxx
parent71c752a63b8904de48b3d61535b4fe1ba368d430 (diff)
parent3232f84c19b86184cb7c2db137b97ccb9aec20cc (diff)
downloadCMake-8fee054ecaf039d4253a2e9cfeafb3c154704808.zip
CMake-8fee054ecaf039d4253a2e9cfeafb3c154704808.tar.gz
CMake-8fee054ecaf039d4253a2e9cfeafb3c154704808.tar.bz2
Merge topic 'vs-manifestuac-flag-map'
3232f84c VS: Fix MANIFESTUAC link flag map to .vcxproj elements Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !526
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index cbc5173..577809f 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -3260,6 +3260,7 @@ bool cmVisualStudio10TargetGenerator::ComputeLinkOptions(
}
linkOptions.Parse(flags.c_str());
+ linkOptions.FixManifestUACFlags();
if (this->MSTools) {
cmGeneratorTarget::ModuleDefinitionInfo const* mdi =