Browse Source

Merge topic 'gtest-discover-tests-cleanup'

d86da0af70 GoogleTest: cleanup file generation

Acked-by: Kitware Robot <[email protected]>
Tested-by: buildbot <[email protected]>
Merge-request: !11254
Brad King 5 months ago
parent
commit
c3b65c19ba
1 changed files with 5 additions and 11 deletions
  1. 5 11
      Modules/GoogleTest.cmake

+ 5 - 11
Modules/GoogleTest.cmake

@@ -756,24 +756,18 @@ function(gtest_discover_tests target)
     )
 
     if(GENERATOR_IS_MULTI_CONFIG)
-      foreach(_config ${CMAKE_CONFIGURATION_TYPES})
-        file(GENERATE
-          OUTPUT "${ctest_file_base}_include-${_config}.cmake"
-          CONTENT "${ctest_include_content}"
-          CONDITION $<CONFIG:${_config}>
-        )
-      endforeach()
+      file(GENERATE
+        OUTPUT "${ctest_file_base}_include-$<CONFIG>.cmake"
+        CONTENT "${ctest_include_content}"
+      )
       file(WRITE "${ctest_include_file}"
         "include(\"${ctest_file_base}_include-\${CTEST_CONFIGURATION_TYPE}.cmake\")"
       )
     else()
       file(GENERATE
-        OUTPUT "${ctest_file_base}_include.cmake"
+        OUTPUT "${ctest_include_file}"
         CONTENT "${ctest_include_content}"
       )
-      file(WRITE "${ctest_include_file}"
-        "include(\"${ctest_file_base}_include.cmake\")"
-      )
     endif()
 
   else()