mirror of
https://github.com/Kitware/CMake.git
synced 2025-12-30 10:20:56 -06:00
Merge topic 'GoogleTest-DISCOVERY_MODE-cleanups'
1458b4c048Help: Add CMAKE_GTEST_DISCOVER_TESTS_DISCOVERY_MODE to release notes642ea49115GoogleTest: Replace SEND_ERROR with FATAL_ERROR09c38e8de6Tests: Don't ask for things not required for GoogleTest Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4938
This commit is contained in:
@@ -194,7 +194,9 @@ Modules
|
||||
|
||||
* gained a new ``DISCOVERY_MODE`` option to control when the test
|
||||
discovery step is run. It offers a new ``PRE_TEST`` setting to
|
||||
run the discovery at test time instead of build time.
|
||||
run the discovery at test time instead of build time. A new
|
||||
``CMAKE_GTEST_DISCOVER_TESTS_DISCOVERY_MODE`` variable can be used
|
||||
to change the default globally.
|
||||
|
||||
* gained a new optional parameter ``XML_OUTPUT_DIR``. When set the
|
||||
JUnit XML test results are stored in that directory.
|
||||
|
||||
@@ -527,7 +527,7 @@ function(gtest_discover_tests TARGET)
|
||||
endif()
|
||||
|
||||
else()
|
||||
message(SEND_ERROR "Unknown DISCOVERY_MODE: ${_DISCOVERY_MODE}")
|
||||
message(FATAL_ERROR "Unknown DISCOVERY_MODE: ${_DISCOVERY_MODE}")
|
||||
endif()
|
||||
|
||||
# Add discovered tests to directory TEST_INCLUDE_FILES
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
project(test_include_dirs)
|
||||
include(CTest)
|
||||
project(test_include_dirs LANGUAGES CXX)
|
||||
include(GoogleTest)
|
||||
|
||||
enable_testing()
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
project(test_include_dirs)
|
||||
include(CTest)
|
||||
project(test_include_dirs LANGUAGES CXX)
|
||||
include(GoogleTest)
|
||||
|
||||
enable_testing()
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
project(test_include_dirs)
|
||||
include(CTest)
|
||||
project(test_include_dirs LANGUAGES CXX)
|
||||
include(GoogleTest)
|
||||
|
||||
enable_testing()
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
project(test_include_dirs)
|
||||
include(CTest)
|
||||
project(test_include_dirs LANGUAGES CXX)
|
||||
include(GoogleTest)
|
||||
|
||||
enable_testing()
|
||||
|
||||
Reference in New Issue
Block a user