Merge c05228b7019e03b62fb868e53356d134dfa1c857 into add971c7cb497d40985b48641891bf9b51423730

This commit is contained in:
0xmbe 2026-05-21 08:43:11 +01:00 committed by GitHub
commit 1a0e874e8e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -121,7 +121,7 @@ include_directories(${gtest_build_include_dirs})
# are used for other targets, to ensure that gtest can be compiled by a user
# aggressive about warnings.
cxx_library(gtest "${cxx_strict}" src/gtest-all.cc)
set_target_properties(gtest PROPERTIES VERSION ${GOOGLETEST_VERSION})
set_target_properties(gtest PROPERTIES VERSION "${GOOGLETEST_VERSION}")
if(GTEST_HAS_ABSL)
target_compile_definitions(gtest PUBLIC GTEST_HAS_ABSL=1)
target_link_libraries(gtest PUBLIC
@ -136,7 +136,7 @@ if(GTEST_HAS_ABSL)
)
endif()
cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc)
set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION})
set_target_properties(gtest_main PROPERTIES VERSION "${GOOGLETEST_VERSION}")
string(REPLACE ";" "$<SEMICOLON>" dirs "${gtest_build_include_dirs}")
target_include_directories(gtest SYSTEM INTERFACE
"$<BUILD_INTERFACE:${dirs}>"