[Cmake-commits] CMake branch, next, updated. v2.8.8-3486-g4ba1c1f

[Peter Kuemmel]

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  4ba1c1fcac91ec82c83ac2c2c37fe9a16894365a (commit)
       via  75bbffbe1b66070df8ac68f1d8b556e7cb0d087c (commit)
      from  57426b2b7d8f8f1d124b00710ec1d5230c964390 (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=4ba1c1fcac91ec82c83ac2c2c37fe9a16894365a
commit 4ba1c1fcac91ec82c83ac2c2c37fe9a16894365a
Merge: 57426b2 75bbffb
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Jul 17 05:22:47 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 17 05:22:47 2012 -0400

    Merge topic 'ninja-mingw-TARGET_PDB' into next
    
    75bbffb Ninja: make TARGET_PDB a real .gdb file name


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=75bbffbe1b66070df8ac68f1d8b556e7cb0d087c
commit 75bbffbe1b66070df8ac68f1d8b556e7cb0d087c
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Tue Jul 17 11:21:03 2012 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Tue Jul 17 11:21:03 2012 +0200

    Ninja: make TARGET_PDB a real .gdb file name

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 265b28a..6d13a9a 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -174,7 +174,14 @@ cmNinjaNormalTargetGenerator
     }
 
     vars.ObjectDir = "$OBJECT_DIR";
+
+    // TODO:
+    // Makefile generator expands <TARGET> to the plain target name
+    // with suffix. $out expands to a relative path. This difference
+    // could make trouble when switching to Ninja generator. Maybe
+    // using TARGET_NAME and RuleVariables::TargetName is a fix.
     vars.Target = "$out";
+
     vars.SONameFlag = "$SONAME_FLAG";
     vars.TargetSOName = "$SONAME";
     vars.TargetInstallNameDir = "$INSTALLNAME_DIR";
@@ -423,7 +430,6 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     EnsureParentDirectoryExists(path);
   }
 
-  // TODO move to GetTargetPDB
   cmMakefile* mf = this->GetMakefile();
   if (mf->GetDefinition("MSVC_C_ARCHITECTURE_ID") ||
       mf->GetDefinition("MSVC_CXX_ARCHITECTURE_ID"))
@@ -438,10 +444,10 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     {
     // 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());
+    std::string base;
+    std::string suffix;
+    this->GetTarget()->GetFullNameComponents(std::string(), base, suffix);
+    vars["TARGET_PDB"] = base + suffix + ".gdb";
     }
 
   if (mf->IsOn("CMAKE_COMPILER_IS_MINGW"))

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

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


hooks/post-receive
-- 
CMake