[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-642-g43bacce

[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  43bacced9aad5ce4129290178bb3765cedeb2be3 (commit)
       via  80afb179e9755baca949e9c7424768a7ae40650b (commit)
      from  6edc86ff309de6a2322ec201d6f833159ad408b6 (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=43bacced9aad5ce4129290178bb3765cedeb2be3
commit 43bacced9aad5ce4129290178bb3765cedeb2be3
Merge: 6edc86f 80afb17
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 24 09:19:40 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 24 09:19:40 2015 -0400

    Merge topic 'export-escaping' into next
    
    80afb179 fixup! Export: Escape exported property values when writing


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80afb179e9755baca949e9c7424768a7ae40650b
commit 80afb179e9755baca949e9c7424768a7ae40650b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 24 09:17:45 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 24 09:17:45 2015 -0400

    fixup! Export: Escape exported property values when writing

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 35ea646..094ad4f 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -34,10 +34,13 @@ static std::string cmExportFileGeneratorEscape(std::string const& str)
 {
   // Escape a property value for writing into a .cmake file.
   std::string result = cmOutputConverter::EscapeForCMake(str);
-  // Un-escape our import prefix variable reference as a special case.
+  // Un-escape variable references generated by our own export code.
   cmSystemTools::ReplaceString(result,
                                "\\${_IMPORT_PREFIX}",
                                "${_IMPORT_PREFIX}");
+  cmSystemTools::ReplaceString(result,
+                               "\\${CMAKE_IMPORT_LIBRARY_SUFFIX}",
+                               "${CMAKE_IMPORT_LIBRARY_SUFFIX}");
   return result;
 }
 

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

Summary of changes:
 Source/cmExportFileGenerator.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake