[Cmake-commits] CMake branch, next, updated. v2.8.2-492-gc9acfd6

[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  c9acfd6140e15cb41db43af884698de42f1e64e1 (commit)
       via  e2341226938857c4b32aa976587fa18cca230a1c (commit)
      from  2a3bbf657b5b3ff1cdca1b4090a20b35e5e04b52 (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=c9acfd6140e15cb41db43af884698de42f1e64e1
commit c9acfd6140e15cb41db43af884698de42f1e64e1
Merge: 2a3bbf6 e234122
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 19 10:58:55 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 19 10:58:55 2010 -0400

    Merge topic 'vs2010-dbginfo-default' into next
    
    e234122 VS2010: Disable PDBs when there is no debug info


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e2341226938857c4b32aa976587fa18cca230a1c
commit e2341226938857c4b32aa976587fa18cca230a1c
Author:     Robert Goulet <Robert.Goulet at autodesk.com>
AuthorDate: Thu Aug 19 09:21:54 2010 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 19 09:21:54 2010 -0400

    VS2010: Disable PDBs when there is no debug info
    
    When none of the options /Z7, /Zi and /ZI are specified in the cmake
    project settings, the project will open in the editor with "Program
    Database" as the default debug information format, ending up always
    generating PDBs regardless of project configuration.
    
    Modify the output project file so that if the debug information format
    is not specified in the cmake project settings it will default to no PDB
    generated, just like all the previous other Visual Studio versions.
    This problem comes from the fact that Microsoft changed the default
    setting of the debug information format to be "Program Database" instead
    of "Disabled".

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 59e20d5..ca522bb 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1033,6 +1033,15 @@ void cmVisualStudio10TargetGenerator::WriteClOptions(
   clOptions.OutputAdditionalOptions(*this->BuildFileStream, "      ", "");
   this->OutputIncludes(includes);
   clOptions.OutputFlagMap(*this->BuildFileStream, "      ");
+
+  // If not in debug mode, write the DebugInformationFormat field
+  // without value so PDBs don't get generated uselessly.
+  if(!clOptions.IsDebug())
+    {
+    this->WriteString("<DebugInformationFormat>"
+                      "</DebugInformationFormat>\n", 3);
+    }
+
   clOptions.OutputPreprocessorDefinitions(*this->BuildFileStream, "      ", 
                                           "\n");
   this->WriteString("<AssemblerListingLocation>", 3);

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

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


hooks/post-receive
-- 
CMake