[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4453-gd96c6eb

[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  d96c6ebda35baa67dfcb0dd4d79d7e4d947cf4db (commit)
       via  6f98f4ac92a789a310cc7d9965556b4a8439654f (commit)
      from  85b897794bc87eb008bfc6dd30d3642ec70a07f8 (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=d96c6ebda35baa67dfcb0dd4d79d7e4d947cf4db
commit d96c6ebda35baa67dfcb0dd4d79d7e4d947cf4db
Merge: 85b8977 6f98f4a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 7 08:25:32 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 7 08:25:32 2013 -0400

    Merge topic 'fix-install-include-dirs-processing' into next
    
    6f98f4a Genex: Fix processing multiple include directories for relative paths


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f98f4ac92a789a310cc7d9965556b4a8439654f
commit 6f98f4ac92a789a310cc7d9965556b4a8439654f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 7 13:24:41 2013 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 7 08:17:12 2013 -0400

    Genex: Fix processing multiple include directories for relative paths
    
    Re-insert the semicolon which was removed during splitting.
    
    Commit d777b8e7 (Genex: Allow relative paths in INSTALL_INTERFACE.,
    2013-07-25) introduced the prefixItems method to allow relative paths
    in the argument of the INSTALL_INTERFACE expression. That method was
    buggy in that it did not re-introduce the semicolon separator in
    the result.
    
    This bug also affects paths which are already absolute in user code.

diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index 127cf6b..d73c72c 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -238,9 +238,12 @@ static void prefixItems(const std::string &content, std::string &result,
 {
   std::vector<std::string> entries;
   cmGeneratorExpression::Split(content, entries);
+  const char *sep = "";
   for(std::vector<std::string>::const_iterator ei = entries.begin();
       ei != entries.end(); ++ei)
     {
+    result += sep;
+    sep = ";";
     if (!cmSystemTools::FileIsFullPath(ei->c_str())
         && cmGeneratorExpression::Find(*ei) == std::string::npos)
       {
diff --git a/Tests/ExportImport/Export/CMakeLists.txt b/Tests/ExportImport/Export/CMakeLists.txt
index 1f23b2a..72ae78f 100644
--- a/Tests/ExportImport/Export/CMakeLists.txt
+++ b/Tests/ExportImport/Export/CMakeLists.txt
@@ -159,7 +159,7 @@ set_property(TARGET testLibRequired APPEND PROPERTY
     $<BUILD_INTERFACE:$<TARGET_PROPERTY:testLibIncludeRequired5,INTERFACE_INCLUDE_DIRECTORIES>>
     # Test that the below is non-fatal
     $<$<STREQUAL:one,two>:$<TARGET_PROPERTY:not_a_target,INTERFACE_INCLUDE_DIRECTORIES>>
-    $<INSTALL_INTERFACE:include/testLibIncludeRequired7>
+    $<INSTALL_INTERFACE:include/testLibIncludeRequired7;include/testLibIncludeRequired4>
 )
 
 set_property(TARGET testLibRequired APPEND PROPERTY

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

Summary of changes:


hooks/post-receive
-- 
CMake