diff options
| author | Brad King <brad.king@kitware.com> | 2016-01-13 14:33:21 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-01-13 14:33:21 (GMT) |
| commit | 05ab4b7c66cccb7b04b05e252671f3628d4795fc (patch) | |
| tree | 4f98a18cf1edaaf34c8a92a0d587256cd03c458b | |
| parent | 59dac28856b6ba5971217e0cf907a76cc0dba82c (diff) | |
| parent | fc5d6592291aaff7238b7625468f9820a596d758 (diff) | |
| download | CMake-05ab4b7c66cccb7b04b05e252671f3628d4795fc.zip CMake-05ab4b7c66cccb7b04b05e252671f3628d4795fc.tar.gz CMake-05ab4b7c66cccb7b04b05e252671f3628d4795fc.tar.bz2 | |
Merge topic 'vs-debug-fastlink'
fc5d6592 VS: Map link `/debug:fastlink` flag to VS 2015 IDE property (#15894)
| -rw-r--r-- | Help/release/dev/vs-debug-fastlink.rst | 5 | ||||
| -rw-r--r-- | Source/cmVS14LinkFlagTable.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Help/release/dev/vs-debug-fastlink.rst b/Help/release/dev/vs-debug-fastlink.rst new file mode 100644 index 0000000..c2e0599 --- /dev/null +++ b/Help/release/dev/vs-debug-fastlink.rst @@ -0,0 +1,5 @@ +vs-debug-fastlink +----------------- + +* The :generator:`Visual Studio 14 2015` generator learned to map the + ``/debug:fastlink`` linker flag to the ``.vcxproj`` file property. diff --git a/Source/cmVS14LinkFlagTable.h b/Source/cmVS14LinkFlagTable.h index 1e781e8..29e3d86 100644 --- a/Source/cmVS14LinkFlagTable.h +++ b/Source/cmVS14LinkFlagTable.h @@ -177,6 +177,8 @@ static cmVS7FlagTable cmVS14LinkFlagTable[] = {"UACUIAccess", "uiAccess='false'", "", "false", 0}, {"UACUIAccess", "uiAccess='true'", "", "true", 0}, {"ManifestEmbed", "manifest:embed", "", "true", 0}, + {"GenerateDebugInformation", "DEBUG:FASTLINK", "", "DebugFastLink", + cmVS7FlagTable::CaseInsensitive}, {"GenerateDebugInformation", "DEBUG", "", "Debug", cmVS7FlagTable::CaseInsensitive}, {"MapExports", "MAPINFO:EXPORTS", "", "true", 0}, |