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 | ab2366609e2401745b4a5148586a6ad48ae07b04 (patch) | |
| tree | 6bb15302f245ebac212e69e650bdad0a9ce4438e | |
| parent | 9d6163fa1b0f94c86efce33d215e62cbdff47465 (diff) | |
| parent | 8829d2caba8301c8ab11b72085ab8089504f273d (diff) | |
| download | CMake-ab2366609e2401745b4a5148586a6ad48ae07b04.zip CMake-ab2366609e2401745b4a5148586a6ad48ae07b04.tar.gz CMake-ab2366609e2401745b4a5148586a6ad48ae07b04.tar.bz2 | |
Merge topic 'support_list_google_test_executor'
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} ) |