[Cmake-commits] CMake branch, next, updated. v2.8.11-2056-g1a3564b

[Stephen Kelly]

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  1a3564b96031019162c99e8c0cf1a10a9dc7ac98 (commit)
       via  f8aa5265b1a547e105dc2ca8fa7fd8575afc5970 (commit)
       via  edeabd18e6db5a52b2191ea9d3b09ee8bd090af6 (commit)
      from  8a3d1bf7f8a21b7c979121e38c219090e054d5ad (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=1a3564b96031019162c99e8c0cf1a10a9dc7ac98
commit 1a3564b96031019162c99e8c0cf1a10a9dc7ac98
Merge: 8a3d1bf f8aa526
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri May 17 04:17:18 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 17 04:17:18 2013 -0400

    Merge topic 'add-EXPORT_NAME-property' into next
    
    f8aa526 Get the name from the target.
    edeabd1 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f8aa5265b1a547e105dc2ca8fa7fd8575afc5970
commit f8aa5265b1a547e105dc2ca8fa7fd8575afc5970
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri May 17 10:12:02 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri May 17 10:12:44 2013 +0200

    Get the name from the target.
    
    Later we can change that to GetExportName. Trying to narrow down
    test failure on Windows.

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 27ec56b..a83a881 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -407,7 +407,7 @@ cmExportFileGenerator::AddTargetNamespace(std::string &input,
     }
   if(this->ExportedTargets.find(tgt) != this->ExportedTargets.end())
     {
-    input = this->Namespace + input;
+    input = this->Namespace + tgt->GetName();
     }
   else
     {

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

Summary of changes:
 Source/CMakeVersion.cmake        |    2 +-
 Source/cmExportFileGenerator.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake