瀏覽代碼

Merge topic 'gtest-discovery-race-condition' into release-4.2

72ce711899 GoogleTest: Avoid POST_BUILD race condition for gtest_discover_tests()

Acked-by: Kitware Robot <[email protected]>
Merge-request: !11392
Brad King 4 周之前
父節點
當前提交
c77f7b1d3f
共有 1 個文件被更改,包括 2 次插入0 次删除
  1. 2 0
      Modules/GoogleTestAddTests.cmake

+ 2 - 0
Modules/GoogleTestAddTests.cmake

@@ -282,6 +282,7 @@ function(gtest_discover_tests_impl)
   set(oneValueArgs
   set(oneValueArgs
     NO_PRETTY_TYPES   # These two take a value, unlike gtest_discover_tests()
     NO_PRETTY_TYPES   # These two take a value, unlike gtest_discover_tests()
     NO_PRETTY_VALUES  #
     NO_PRETTY_VALUES  #
+    TEST_TARGET
     TEST_EXECUTABLE
     TEST_EXECUTABLE
     TEST_WORKING_DIR
     TEST_WORKING_DIR
     TEST_PREFIX
     TEST_PREFIX
@@ -420,6 +421,7 @@ if(CMAKE_SCRIPT_MODE_FILE)
   gtest_discover_tests_impl(
   gtest_discover_tests_impl(
     NO_PRETTY_TYPES ${NO_PRETTY_TYPES}
     NO_PRETTY_TYPES ${NO_PRETTY_TYPES}
     NO_PRETTY_VALUES ${NO_PRETTY_VALUES}
     NO_PRETTY_VALUES ${NO_PRETTY_VALUES}
+    TEST_TARGET ${TEST_TARGET}
     TEST_EXECUTABLE ${TEST_EXECUTABLE}
     TEST_EXECUTABLE ${TEST_EXECUTABLE}
     TEST_EXECUTOR "${TEST_EXECUTOR}"
     TEST_EXECUTOR "${TEST_EXECUTOR}"
     TEST_WORKING_DIR ${TEST_WORKING_DIR}
     TEST_WORKING_DIR ${TEST_WORKING_DIR}