summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurits Riple <laurits@riple.se>2020-07-31 02:03:18 (GMT)
committerBrad King <brad.king@kitware.com>2020-08-03 16:10:58 (GMT)
commit8829d2caba8301c8ab11b72085ab8089504f273d (patch)
treec1a4ad95b5c45b41fe5cd2c84e9b83b96920a2ff
parent63a65baf4c343c73b2142078ef0045d3711dea1d (diff)
downloadCMake-8829d2caba8301c8ab11b72085ab8089504f273d.zip
CMake-8829d2caba8301c8ab11b72085ab8089504f273d.tar.gz
CMake-8829d2caba8301c8ab11b72085ab8089504f273d.tar.bz2
GoogleTest: Restore support for list arguments in TEST_EXECUTOR
Refactoring in commit 889a7146ff (GoogleTestAddTests: Refactor into callable method, 2020-03-16, v3.18.0-rc1~450^2~3) accidentally parsed `TEST_EXECUTOR` as a single-value argument instead of a list.
-rw-r--r--Modules/GoogleTestAddTests.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/GoogleTestAddTests.cmake b/Modules/GoogleTestAddTests.cmake
index 5d098d9..883e1f4 100644
--- a/Modules/GoogleTestAddTests.cmake
+++ b/Modules/GoogleTestAddTests.cmake
@@ -44,8 +44,8 @@ function(gtest_discover_tests_impl)
cmake_parse_arguments(
""
""
- "NO_PRETTY_TYPES;NO_PRETTY_VALUES;TEST_EXECUTABLE;TEST_EXECUTOR;TEST_WORKING_DIR;TEST_PREFIX;TEST_SUFFIX;TEST_LIST;CTEST_FILE;TEST_DISCOVERY_TIMEOUT;TEST_XML_OUTPUT_DIR"
- "TEST_EXTRA_ARGS;TEST_PROPERTIES"
+ "NO_PRETTY_TYPES;NO_PRETTY_VALUES;TEST_EXECUTABLE;TEST_WORKING_DIR;TEST_PREFIX;TEST_SUFFIX;TEST_LIST;CTEST_FILE;TEST_DISCOVERY_TIMEOUT;TEST_XML_OUTPUT_DIR"
+ "TEST_EXTRA_ARGS;TEST_PROPERTIES;TEST_EXECUTOR"
${ARGN}
)