summaryrefslogtreecommitdiffstats
path: root/Source/cmVS10LinkFlagTable.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2012-10-26 15:02:42 (GMT)
committerBrad King <brad.king@kitware.com>2012-10-26 15:02:42 (GMT)
commit035e7bd04ea620c813adcdf402de2c25b6ce7e9c (patch)
tree7cc67969486451d5b21d72d99dd247b7c84871b4 /Source/cmVS10LinkFlagTable.h
parentc65a2ea6a83f274afc52ca6adc457dec069de064 (diff)
downloadCMake-035e7bd04ea620c813adcdf402de2c25b6ce7e9c.zip
CMake-035e7bd04ea620c813adcdf402de2c25b6ce7e9c.tar.gz
CMake-035e7bd04ea620c813adcdf402de2c25b6ce7e9c.tar.bz2
VS10: Honor /DELAYSIGN and /KEYFILE flags (#13601)
Fix the VS 10 link flag map to name the project file entries correctly. The VS 11 link flag map already has the correct names. Generate the entries in the <PropertyGroup> along with incremental linking options. Drop them from the <Link> element because VS does not use them.
Diffstat (limited to 'Source/cmVS10LinkFlagTable.h')
-rw-r--r--Source/cmVS10LinkFlagTable.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmVS10LinkFlagTable.h b/Source/cmVS10LinkFlagTable.h
index c60e8eb..64febbb 100644
--- a/Source/cmVS10LinkFlagTable.h
+++ b/Source/cmVS10LinkFlagTable.h
@@ -182,8 +182,8 @@ static cmVS7FlagTable cmVS10LinkFlagTable[] =
{"SupportUnloadOfDelayLoadedDLL", "DELAY:UNLOAD", "", "true", 0},
{"SupportNobindOfDelayLoadedDLL", "DELAY:NOBIND", "", "true", 0},
{"Profile", "PROFILE", "", "true", 0},
- {"DelaySign", "DELAYSIGN:NO", "", "false", 0},
- {"DelaySign", "DELAYSIGN", "", "true", 0},
+ {"LinkDelaySign", "DELAYSIGN:NO", "", "false", 0},
+ {"LinkDelaySign", "DELAYSIGN", "", "true", 0},
{"CLRUnmanagedCodeCheck", "CLRUNMANAGEDCODECHECK:NO", "", "false", 0},
{"CLRUnmanagedCodeCheck", "CLRUNMANAGEDCODECHECK", "", "true", 0},
{"ImageHasSafeExceptionHandlers", "SAFESEH:NO", "", "false", 0},
@@ -294,7 +294,7 @@ static cmVS7FlagTable cmVS10LinkFlagTable[] =
{"MergeSections", "MERGE:",
"Merge Sections",
"", cmVS7FlagTable::UserValue},
- {"KeyFile", "KEYFILE:",
+ {"LinkKeyFile", "KEYFILE:",
"Key File",
"", cmVS7FlagTable::UserValue},
{"KeyContainer", "KEYCONTAINER:",