[Cmake-commits] CMake branch, next, updated. v3.1.2-1278-g1c961d4

[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  1c961d4388be52bf7b6d644357a9cc86698d2eb1 (commit)
       via  e614bb74893c7cb8583f131b1b0fe44af0c128e0 (commit)
      from  84c6acb615a1fc48c43f75241c1de74a337b8d07 (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=1c961d4388be52bf7b6d644357a9cc86698d2eb1
commit 1c961d4388be52bf7b6d644357a9cc86698d2eb1
Merge: 84c6acb e614bb7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 15:18:48 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 15:18:48 2015 -0500

    Merge topic 'clean-up-cmMacroCommand' into next
    
    e614bb74 Revert "cmMacroCommand: Remove condition around ARGV replacement."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e614bb74893c7cb8583f131b1b0fe44af0c128e0
commit e614bb74893c7cb8583f131b1b0fe44af0c128e0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 21:15:17 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 21:15:17 2015 +0100

    Revert "cmMacroCommand: Remove condition around ARGV replacement."
    
    This reverts commit da4078d8654177c683d3f0544bdde8490537030c.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 1bc63a7..c6f0571 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -172,10 +172,13 @@ bool cmMacroHelperCommand::InvokeInitialPass
 
         // if the current argument of the current function has ${ARGV in it
         // then try replacing ARGV values
-        for (unsigned int t = 0; t < expandedArgs.size(); ++t)
+        if (tmps.find("${ARGV") != std::string::npos)
           {
-          cmSystemTools::ReplaceString(tmps, argVs[t].c_str(),
-                                       expandedArgs[t].c_str());
+          for (unsigned int t = 0; t < expandedArgs.size(); ++t)
+            {
+            cmSystemTools::ReplaceString(tmps, argVs[t].c_str(),
+                                         expandedArgs[t].c_str());
+            }
           }
 
         arg.Value = tmps;

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

Summary of changes:
 Source/cmMacroCommand.cxx |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake