[Cmake-commits] CMake branch, next, updated. v3.2.1-1236-g99052a9

[Bill Hoffman]

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  99052a9ddb3e60dd978a722229a17a0b4651219f (commit)
       via  e680d43d7dd96096962379f627828a182ac0fa80 (commit)
      from  2d49fa73f23f4591bd22370ee34340a575d02183 (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=99052a9ddb3e60dd978a722229a17a0b4651219f
commit 99052a9ddb3e60dd978a722229a17a0b4651219f
Merge: 2d49fa7 e680d43
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Thu Mar 26 11:43:14 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 26 11:43:14 2015 -0400

    Merge topic 'clean-scanbuild-warnings' into next
    
    e680d43d Fix an unused variable warning from scanbuild.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e680d43d7dd96096962379f627828a182ac0fa80
commit e680d43d7dd96096962379f627828a182ac0fa80
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Thu Mar 26 11:05:56 2015 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Thu Mar 26 11:05:56 2015 -0400

    Fix an unused variable warning from scanbuild.

diff --git a/Source/cmSetTestsPropertiesCommand.cxx b/Source/cmSetTestsPropertiesCommand.cxx
index d079a19..e9cfacc 100644
--- a/Source/cmSetTestsPropertiesCommand.cxx
+++ b/Source/cmSetTestsPropertiesCommand.cxx
@@ -26,14 +26,12 @@ bool cmSetTestsPropertiesCommand
 
   // first collect up the list of files
   std::vector<std::string> propertyPairs;
-  bool doingFiles = true;
   int numFiles = 0;
   std::vector<std::string>::const_iterator j;
   for(j= args.begin(); j != args.end();++j)
     {
     if(*j == "PROPERTIES")
       {
-      doingFiles = false;
       // now loop through the rest of the arguments, new style
       ++j;
       if (std::distance(j, args.end()) % 2 != 0)
@@ -44,15 +42,9 @@ bool cmSetTestsPropertiesCommand
       propertyPairs.insert(propertyPairs.end(), j, args.end());
       break;
       }
-    else if (doingFiles)
-      {
-      numFiles++;
-      }
     else
       {
-      this->SetError("called with illegal arguments, maybe "
-                     "missing a PROPERTIES specifier?");
-      return false;
+      numFiles++;
       }
     }
   if(propertyPairs.empty())
@@ -62,7 +54,6 @@ bool cmSetTestsPropertiesCommand
     return false;
     }
 
-
   // now loop over all the targets
   int i;
   for(i = 0; i < numFiles; ++i)

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

Summary of changes:
 Source/cmSetTestsPropertiesCommand.cxx |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)


hooks/post-receive
-- 
CMake