[Cmake-commits] CMake branch, next, updated. v2.8.8-3478-ga473edf

Peter Kuemmel syntheticpp at gmx.net
Mon Jul 16 09:06:25 EDT 2012


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  a473edf6b06b4d89f7f16b07de8643db6e1b6e3a (commit)
       via  ae8124a04c414ebd11dd411bc3296849e3373157 (commit)
      from  e94500f154f9ec742aacf247840892464a7bffc2 (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=a473edf6b06b4d89f7f16b07de8643db6e1b6e3a
commit a473edf6b06b4d89f7f16b07de8643db6e1b6e3a
Merge: e94500f ae8124a
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Mon Jul 16 09:06:22 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 16 09:06:22 2012 -0400

    Merge topic 'ninja-mingw-TARGET_PDB' into next
    
    ae8124a Ninja: also mingw needs TARGET_PDB


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae8124a04c414ebd11dd411bc3296849e3373157
commit ae8124a04c414ebd11dd411bc3296849e3373157
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Mon Jul 16 14:16:43 2012 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Mon Jul 16 15:03:38 2012 +0200

    Ninja: also mingw needs TARGET_PDB

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index be7739e..19f0342 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -434,6 +434,15 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
                           cmLocalGenerator::SHELL);
     EnsureParentDirectoryExists(path);
     }
+  else
+    {
+    // It is common to place debug symbols at a specific place,
+    // so we need a plain target name in the rule available.
+    // TODO: Makefile generator could use <TARGET> because it expands
+    //       to the plain target name, here it expands to a relative path.
+    //       This difference could make trouble when switching to Ninja generator.
+    vars["TARGET_PDB"] = std::string(this->GetTarget()->GetName());
+    }
 
   if (mf->IsOn("CMAKE_COMPILER_IS_MINGW"))
     {

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list