[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3262-g4a7beaf

[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  4a7beaff42a2467fdd3b5e20440d3b19835b22a1 (commit)
       via  e392ec0d881d8475b2d2dd2041ad051ad4c02c31 (commit)
       via  30f1a8159d5f016d5429ec040b725a88cab0b1f3 (commit)
      from  e45630796e11b5c2fd19914d6301ee49803728e0 (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=4a7beaff42a2467fdd3b5e20440d3b19835b22a1
commit 4a7beaff42a2467fdd3b5e20440d3b19835b22a1
Merge: e456307 e392ec0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jul 22 07:58:55 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 22 07:58:55 2013 -0400

    Merge topic 'framework-interface-includes' into next
    
    e392ec0 Revert "Add debugging information for the framework location."
    30f1a81 Fix ExportImport test failure.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e392ec0d881d8475b2d2dd2041ad051ad4c02c31
commit e392ec0d881d8475b2d2dd2041ad051ad4c02c31
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jul 22 13:57:57 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Jul 22 13:57:57 2013 +0200

    Revert "Add debugging information for the framework location."
    
    This reverts commit 45f7a7b7de648d8ab65073f6ea28d300c12c1d1f.

diff --git a/Tests/ExportImport/Import/A/framework_interface/CMakeLists.txt b/Tests/ExportImport/Import/A/framework_interface/CMakeLists.txt
index b953f2e..0e00655 100644
--- a/Tests/ExportImport/Import/A/framework_interface/CMakeLists.txt
+++ b/Tests/ExportImport/Import/A/framework_interface/CMakeLists.txt
@@ -1,7 +1,6 @@
 
 add_library(exp_framework_test framework_test.cpp)
 get_target_property(exp_loc exp_testLib4 LOCATION)
-message("Framework location: ${exp_loc}")
 target_link_libraries(exp_framework_test ${exp_loc})
 
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30f1a8159d5f016d5429ec040b725a88cab0b1f3
commit 30f1a8159d5f016d5429ec040b725a88cab0b1f3
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Jul 22 05:37:42 2013 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Mon Jul 22 05:40:44 2013 -0600

    Fix ExportImport test failure.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 37b20ec..34856ae 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -3407,15 +3407,17 @@ std::vector<std::string> cmTarget::GetIncludeDirectories(const char *config)
         std::string libDir = cmSystemTools::CollapseFullPath(it->c_str());
 
         static cmsys::RegularExpression
-          frameworkCheck("(\\.framework)(/Versions/[^/]+)?/[^/]+$");
+          frameworkCheck("(.*\\.framework)(/Versions/[^/]+)?/[^/]+$");
         if(!frameworkCheck.find(libDir))
           {
           continue;
           }
 
+        libDir = frameworkCheck.match(1);
+
         cmGeneratorExpression ge(lfbt);
         cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
-                  ge.Parse(cmSystemTools::GetParentDirectory(libDir.c_str()));
+                  ge.Parse(libDir.c_str());
         this->Internal
                 ->CachedLinkInterfaceIncludeDirectoriesEntries[configString]
                 .push_back(new cmTargetInternals::TargetPropertyEntry(cge));

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

Summary of changes:
 Source/cmTarget.cxx                                |    6 ++++--
 .../Import/A/framework_interface/CMakeLists.txt    |    1 -
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake