[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4451-g85b8977

[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  85b897794bc87eb008bfc6dd30d3642ec70a07f8 (commit)
       via  cad85a25a6b9f7a4715f88c92d69be69e44b9be6 (commit)
      from  d5ad081e1dd0e7b7b446086db9e088c2fd966fe8 (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=85b897794bc87eb008bfc6dd30d3642ec70a07f8
commit 85b897794bc87eb008bfc6dd30d3642ec70a07f8
Merge: d5ad081 cad85a2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 7 07:44:55 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 7 07:44:55 2013 -0400

    Merge topic 'fix-install-include-dirs-processing' into next
    
    cad85a2 Fix processing multiple include directories for relative paths.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cad85a25a6b9f7a4715f88c92d69be69e44b9be6
commit cad85a25a6b9f7a4715f88c92d69be69e44b9be6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 7 13:24:41 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 7 13:38:05 2013 +0200

    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:
 Source/cmGeneratorExpression.cxx         |    3 +++
 Tests/ExportImport/Export/CMakeLists.txt |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake