diff options
author | Brad King <brad.king@kitware.com> | 2020-08-06 14:36:56 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2020-08-06 14:37:03 (GMT) |
commit | 9c4130ed604fd1fcb35f0ae37a94011a74c750d4 (patch) | |
tree | d2ee1ebfa3d1bbfd6050b59ea594fa52c80b354e | |
parent | ab4895d6b2e5d21222832881ba6523f681f2b3fb (diff) | |
parent | 8829d2caba8301c8ab11b72085ab8089504f273d (diff) | |
download | CMake-9c4130ed604fd1fcb35f0ae37a94011a74c750d4.zip CMake-9c4130ed604fd1fcb35f0ae37a94011a74c750d4.tar.gz CMake-9c4130ed604fd1fcb35f0ae37a94011a74c750d4.tar.bz2 |
Merge topic 'support_list_google_test_executor' into release-3.18
8829d2caba GoogleTest: Restore support for list arguments in TEST_EXECUTOR
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5084
-rw-r--r-- | Modules/GoogleTestAddTests.cmake | 4 |
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} ) |