[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5326-gd2ee1ee

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  d2ee1eeacdf2f371ede62176560a665fbe5713bb (commit)
       via  bf1db4963fe9b71a2a4bd7232604ccea730ef4d2 (commit)
      from  02eaa9a31b14635270657733d93c3e0efbd0a279 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d2ee1eeacdf2f371ede62176560a665fbe5713bb
commit d2ee1eeacdf2f371ede62176560a665fbe5713bb
Merge: 02eaa9a bf1db49
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 19 08:51:55 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 19 08:51:55 2013 -0500

    Merge topic 'vs9-map-Fd' into next
    
    bf1db49 VS: Map /Fd to ProgramDataBaseFileName for VS 7,8,9 (#14577)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf1db4963fe9b71a2a4bd7232604ccea730ef4d2
commit bf1db4963fe9b71a2a4bd7232604ccea730ef4d2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 18 11:37:49 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 18 11:48:38 2013 -0500

    VS: Map /Fd to ProgramDataBaseFileName for VS 7,8,9 (#14577)
    
    Since commit 42ba1b08 (VS: Separate compiler and linker PDB files,
    2013-04-05) the VS generators no longer add ProgramDataBaseFileName.
    Therefore we should allow projects to do so by mapping the /Fd option.
    For VS >= 10 our flag tables map /Fd to ProgramDataBaseFileName already.
    Add the mapping for VS 7, 8, and 9.

diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index bd6c860..8ffd96e 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -477,6 +477,8 @@ cmVS7FlagTable cmLocalVisualStudio7GeneratorFlagTable[] =
 
   {"AssemblerListingLocation", "Fa", "ASM List Location", "",
    cmVS7FlagTable::UserValue},
+  {"ProgramDataBaseFileName", "Fd", "Program Database File Name", "",
+   cmVS7FlagTable::UserValue},
 
   // boolean flags
   {"BufferSecurityCheck", "GS", "Buffer security check", "TRUE", 0},

-----------------------------------------------------------------------

Summary of changes:
 Source/cmLocalVisualStudio7Generator.cxx |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake