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 1835942c915892d6a27a869f49f5583de0b34284 (commit)
via b5e7b22defa353894ad999df83b90ae45f163d61 (commit)
from 4b07dbef44da7241224820e19fd74211cd84181b (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1835942c915892d6a27a869f49f5583de0b34284
commit 1835942c915892d6a27a869f49f5583de0b34284
Merge: 4b07dbe b5e7b22
Author: Brad King <[email protected]>
AuthorDate: Wed Nov 18 10:43:08 2015 -0500
Commit: CMake Topic Stage <[email protected]>
CommitDate: Wed Nov 18 10:43:08 2015 -0500
Merge topic 'FindGTest-avoid-CMP0064' into next
b5e7b22d FindGTest: Refactor test type checks to avoid cases triggering
CMP0064
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b5e7b22defa353894ad999df83b90ae45f163d61
commit b5e7b22defa353894ad999df83b90ae45f163d61
Author: Brad King <[email protected]>
AuthorDate: Wed Nov 18 10:36:41 2015 -0500
Commit: Brad King <[email protected]>
CommitDate: Wed Nov 18 10:42:55 2015 -0500
FindGTest: Refactor test type checks to avoid cases triggering CMP0064
Update our if() conditions to avoid CMP0064 warnings when `${test_type}`
is equal to `TEST`.
Reported-by: David T. Chen <[email protected]>
diff --git a/Modules/FindGTest.cmake b/Modules/FindGTest.cmake
index fccf877..eb7abfd 100644
--- a/Modules/FindGTest.cmake
+++ b/Modules/FindGTest.cmake
@@ -124,11 +124,11 @@ function(GTEST_ADD_TESTS executable extra_args)
string(REGEX MATCH "${gtest_test_type_regex}" test_type ${hit})
# Parameterized tests have a different signature for the filter
- if(${test_type} STREQUAL "TEST_P")
+ if("x${test_type}" STREQUAL "xTEST_P")
string(REGEX REPLACE ${gtest_case_name_regex} "*/\\1.\\2/*"
test_name ${hit})
- elseif(${test_type} STREQUAL "TEST_F" OR ${test_type} STREQUAL
"TEST")
+ elseif("x${test_type}" STREQUAL "xTEST_F" OR "x${test_type}"
STREQUAL "xTEST")
string(REGEX REPLACE ${gtest_case_name_regex} "\\1.\\2" test_name
${hit})
- elseif(${test_type} STREQUAL "TYPED_TEST")
+ elseif("x${test_type}" STREQUAL "xTYPED_TEST")
string(REGEX REPLACE ${gtest_case_name_regex} "\\1/*.\\2"
test_name ${hit})
else()
message(WARNING "Could not parse GTest ${hit} for adding to
CTest.")
-----------------------------------------------------------------------
Summary of changes:
Modules/FindGTest.cmake | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/mailman/listinfo/cmake-commits
