summaryrefslogtreecommitdiffstats
path: root/Source/cmVS14LinkFlagTable.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-06-24 19:48:54 (GMT)
committerBrad King <brad.king@kitware.com>2014-06-25 18:51:23 (GMT)
commitbdc7d9c8d90ded163d1afd3e5d6c9a1135974b2c (patch)
tree75262e7dd82f76611e5e8b87cf25b55e27973d33 /Source/cmVS14LinkFlagTable.h
parentd96b3f68f422bc57541a912e6983fcab095f6426 (diff)
downloadCMake-bdc7d9c8d90ded163d1afd3e5d6c9a1135974b2c.zip
CMake-bdc7d9c8d90ded163d1afd3e5d6c9a1135974b2c.tar.gz
CMake-bdc7d9c8d90ded163d1afd3e5d6c9a1135974b2c.tar.bz2
VS14: Fix Cl and Link flag tables as previous versions
Apply the flag table fixes from: commit 9c7f234c (VS: Fix /MANIFESTUAC:NO linker option mapping, 2014-05-07) commit e8633e66 (VS: Fix /analyze:log flag mapping, 2014-04-01) commit f2caf795 (VS: Fix /MAP:mapfile flag mapping, 2013-07-09) to the VS 14 flag tables.
Diffstat (limited to 'Source/cmVS14LinkFlagTable.h')
-rw-r--r--Source/cmVS14LinkFlagTable.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/cmVS14LinkFlagTable.h b/Source/cmVS14LinkFlagTable.h
index cb55459..6d81d12 100644
--- a/Source/cmVS14LinkFlagTable.h
+++ b/Source/cmVS14LinkFlagTable.h
@@ -217,17 +217,14 @@ static cmVS7FlagTable cmVS14LinkFlagTable[] =
{"LinkDLL", "DLL", "", "true", 0},
//Bool Properties With Argument
- {"EnableUAC", "MANIFESTUAC:NO", "", "false",
- cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue},
- {"EnableUAC", "MANIFESTUAC:NO", "Enable User Account Control (UAC)", "",
- cmVS7FlagTable::UserValueRequired},
+ {"EnableUAC", "MANIFESTUAC:NO", "", "false", 0},
{"EnableUAC", "MANIFESTUAC:", "", "true",
cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue},
{"UACUIAccess", "MANIFESTUAC:", "Enable User Account Control (UAC)", "",
cmVS7FlagTable::UserValueRequired},
{"GenerateMapFile", "MAP", "", "true",
cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue},
- {"MapFileName", "MAP", "Generate Map File", "",
+ {"MapFileName", "MAP:", "Generate Map File", "",
cmVS7FlagTable::UserValueRequired},
//String List Properties