mirror of
https://github.com/google/googletest.git
synced 2026-07-30 16:26:24 +08:00
Merge 10fa6ff3f28e357865003dd91008f89963d6f724 into b78aa5ee64be299ae50932e7b4d7e5d7b89a72f6
This commit is contained in:
commit
0204e2affc
@ -153,7 +153,6 @@ macro(config_compiler_and_linker)
|
||||
else()
|
||||
set(GTEST_HAS_PTHREAD_MACRO "-DGTEST_HAS_PTHREAD=0")
|
||||
endif()
|
||||
set(cxx_base_flags "${cxx_base_flags} ${GTEST_HAS_PTHREAD_MACRO}")
|
||||
|
||||
# For building gtest's own tests and samples.
|
||||
set(cxx_exception "${cxx_base_flags} ${cxx_exception_flags}")
|
||||
@ -173,6 +172,7 @@ function(cxx_library_with_type name type cxx_flags)
|
||||
# ARGN refers to additional arguments after 'cxx_flags'.
|
||||
add_library(${name} ${type} ${ARGN})
|
||||
add_library(${cmake_package_name}::${name} ALIAS ${name})
|
||||
target_compile_definitions(${name} PUBLIC "${GTEST_HAS_PTHREAD_MACRO}")
|
||||
set_target_properties(${name}
|
||||
PROPERTIES
|
||||
COMPILE_FLAGS "${cxx_flags}")
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user