[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3008-gf747145

[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  f747145375ca81ca4cc23f4baa235196f14537a2 (commit)
       via  fc5300a355ff27875cbf1c2578c3b2bed6a8f538 (commit)
      from  63c484deb1c93b014fe309ffee76adbdb0040672 (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=f747145375ca81ca4cc23f4baa235196f14537a2
commit f747145375ca81ca4cc23f4baa235196f14537a2
Merge: 63c484d fc5300a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jul 10 07:15:42 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 10 07:15:42 2013 -0400

    Merge topic 'compile-defs-debugging' into next
    
    fc5300a Add a hack to workaround handling of escaped semicolons.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc5300a355ff27875cbf1c2578c3b2bed6a8f538
commit fc5300a355ff27875cbf1c2578c3b2bed6a8f538
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jul 10 09:41:17 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Jul 10 13:15:23 2013 +0200

    Add a hack to workaround handling of escaped semicolons.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index affe417..0f9e726 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -3284,12 +3284,36 @@ static void processCompileOptionsInternal(cmTarget *tgt,
     std::vector<std::string> entryOptions = (*it)->CachedEntries;
     if(entryOptions.empty())
       {
-      cmSystemTools::ExpandListArgument((*it)->ge->Evaluate(mf,
+      std::string result = (*it)->ge->Evaluate(mf,
                                                 config,
                                                 false,
                                                 tgt,
-                                                dagChecker),
-                                      entryOptions);
+                                                dagChecker);
+
+      std::vector<std::string> list;
+      {
+      size_t pos = 0;
+      while((pos = result.find("\\;", pos)) != std::string::npos)
+        {
+        result.replace(pos, 2, "<SEMICOLON>");
+        pos += 11;
+        }
+      }
+      cmSystemTools::ExpandListArgument(result, list);
+      for (std::vector<std::string>::const_iterator it2 = list.begin();
+          it2 != list.end(); ++it2)
+        {
+        std::string item = *it2;
+        {
+        size_t pos = 0;
+        while((pos = item.find("<SEMICOLON>", pos)) != std::string::npos)
+          {
+            item.replace(pos, 11, ";");
+            pos += 2;
+            }
+        }
+        entryOptions.push_back(item);
+        }
       if (mf->IsGeneratingBuildSystem()
           && !(*it)->ge->GetHadContextSensitiveCondition())
         {

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

Summary of changes:


hooks/post-receive
-- 
CMake