mirror of
https://github.com/google/googletest.git
synced 2026-01-01 03:12:20 +08:00
Merge c05228b7019e03b62fb868e53356d134dfa1c857 into 9156d4caac880b513264ecbe0aa4746a3fead3d7
This commit is contained in:
commit
f2fc8ca046
@ -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}>"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user