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 0726f7a3f87a591af2d3f3e559b6ad2a16102062 (commit)
via a5d3d003d0192f8d5fd87885f948338c04fc3f85 (commit)
from 5189455f32fa01aca4952e5fb831ea87be0dfa8d (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=0726f7a3f87a591af2d3f3e559b6ad2a16102062
commit 0726f7a3f87a591af2d3f3e559b6ad2a16102062
Merge: 5189455 a5d3d00
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Mar 15 15:21:46 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Mar 15 15:21:46 2016 -0400
Merge topic 'FindGTest-depends' into next
a5d3d003 FindGTest: Automatically re-run cmake when tests change
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a5d3d003d0192f8d5fd87885f948338c04fc3f85
commit a5d3d003d0192f8d5fd87885f948338c04fc3f85
Author: Zak Eckert <eckert...@gmail.com>
AuthorDate: Fri Mar 11 11:23:32 2016 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Mar 15 15:21:37 2016 -0400
FindGTest: Automatically re-run cmake when tests change
Tell CMake that it needs to re-run when test source files parsed by
`gtest_add_tests` change so that we can re-scan for tests automatically.
diff --git a/Help/release/dev/FindGTest-depends.rst
b/Help/release/dev/FindGTest-depends.rst
new file mode 100644
index 0000000..33c1489
--- /dev/null
+++ b/Help/release/dev/FindGTest-depends.rst
@@ -0,0 +1,6 @@
+FindGTest-depends
+-----------------
+
+* The :module:`FindGTest` module ``gtest_add_tests`` function now causes
+ CMake to automatically re-run when test sources change so that they
+ can be re-scanned.
diff --git a/Modules/FindGTest.cmake b/Modules/FindGTest.cmake
index ca49e4a..a7ffcfe 100644
--- a/Modules/FindGTest.cmake
+++ b/Modules/FindGTest.cmake
@@ -82,8 +82,7 @@
# ``AUTO`` to find them from executable target
#
# However, note that this macro will slow down your tests by running
-# an executable for each test and test fixture. You will also have to
-# re-run CMake after adding or removing tests or test fixtures.
+# an executable for each test and test fixture.
#
# Example usage::
#
@@ -119,6 +118,7 @@ function(GTEST_ADD_TESTS executable extra_args)
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})
+ set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS
${source})
file(READ "${source}" contents)
string(REGEX MATCHALL "${gtest_test_type_regex} *\\(([A-Za-z_0-9
,]+)\\)" found_tests ${contents})
foreach(hit ${found_tests})
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/FindGTest-depends.rst | 6 ++++++
Modules/FindGTest.cmake | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
create mode 100644 Help/release/dev/FindGTest-depends.rst
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
