[Cmake-commits] CMake branch, next, updated. v3.2.2-2474-gcab41d4

[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  cab41d4b45334f527c33f0c5daa3ee49a5afb67b (commit)
       via  0f927b440adbe3ecca1b8987ed8c5e442a324ff0 (commit)
      from  0790bd649365b79f185970978d560da74ebdb1c4 (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=cab41d4b45334f527c33f0c5daa3ee49a5afb67b
commit cab41d4b45334f527c33f0c5daa3ee49a5afb67b
Merge: 0790bd6 0f927b4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 4 11:29:33 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 4 11:29:33 2015 -0400

    Merge topic 'FindGTest-fix-test-space-parsing' into next
    
    0f927b44 FindGTest: Fix parsing of test macro calls with spaces (#15553)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f927b440adbe3ecca1b8987ed8c5e442a324ff0
commit 0f927b440adbe3ecca1b8987ed8c5e442a324ff0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 4 11:23:30 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon May 4 11:28:50 2015 -0400

    FindGTest: Fix parsing of test macro calls with spaces (#15553)
    
    Tolerate spaces before the open paren and after the test name before the
    comma.

diff --git a/Modules/FindGTest.cmake b/Modules/FindGTest.cmake
index e6b5b0a..fccf877 100644
--- a/Modules/FindGTest.cmake
+++ b/Modules/FindGTest.cmake
@@ -115,11 +115,11 @@ function(GTEST_ADD_TESTS executable extra_args)
         # obtain sources used for building that executable
         get_property(ARGN TARGET ${executable} PROPERTY SOURCES)
     endif()
-    set(gtest_case_name_regex ".*\\( *([A-Za-z_0-9]+), *([A-Za-z_0-9]+) *\\).*")
+    set(gtest_case_name_regex ".*\\( *([A-Za-z_0-9]+) *, *([A-Za-z_0-9]+) *\\).*")
     set(gtest_test_type_regex "(TYPED_TEST|TEST_?[FP]?)")
     foreach(source ${ARGN})
         file(READ "${source}" contents)
-        string(REGEX MATCHALL "${gtest_test_type_regex}\\(([A-Za-z_0-9 ,]+)\\)" found_tests ${contents})
+        string(REGEX MATCHALL "${gtest_test_type_regex} *\\(([A-Za-z_0-9 ,]+)\\)" found_tests ${contents})
         foreach(hit ${found_tests})
           string(REGEX MATCH "${gtest_test_type_regex}" test_type ${hit})
 

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

Summary of changes:
 Modules/FindGTest.cmake |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake