[Cmake-commits] CMake branch, next, updated. v2.8.7-2038-g8e4e44f

[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  8e4e44feefab80489465d83e22bd2cafeada9d65 (commit)
       via  655a7dd1d41ac9d44d1f6455959809230bddcd78 (commit)
      from  26cfacf8f152ebc498269907b4783260003752ff (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=8e4e44feefab80489465d83e22bd2cafeada9d65
commit 8e4e44feefab80489465d83e22bd2cafeada9d65
Merge: 26cfacf 655a7dd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 15:40:38 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 9 15:40:38 2012 -0500

    Merge topic 'vs10-fix-pdbname-issue-12328' into next
    
    655a7dd VS10: Fix /pdb option vcxproj element name (#12328)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=655a7dd1d41ac9d44d1f6455959809230bddcd78
commit 655a7dd1d41ac9d44d1f6455959809230bddcd78
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 14:54:45 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 9 14:54:45 2012 -0500

    VS10: Fix /pdb option vcxproj element name (#12328)
    
    The compiler tool uses "ProgramDataBaseFileName" but the linker tool
    uses just "ProgramDataBaseFile".  Fix the generator accordingly.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index a219ae9..449adc1 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1490,7 +1490,7 @@ void cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const&
   imLib += targetNameImport;
 
   linkOptions.AddFlag("ImportLibrary", imLib.c_str());
-  linkOptions.AddFlag("ProgramDataBaseFileName", pdb.c_str());
+  linkOptions.AddFlag("ProgramDataBaseFile", pdb.c_str());
   linkOptions.Parse(flags.c_str());
   if(!this->ModuleDefinitionFile.empty())
     {

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

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


hooks/post-receive
-- 
CMake