outman/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly export GTEST_HAS_PTHREAD compile definition with CMake

Browse Source
This commit is contained in:
Damien L-G 2021-12-03 12:26:57 -05:00
parent 1b2606425c
commit 10fa6ff3f2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
googletest/cmake/internal_utils.cmake
View File

@ -131,7 +131,6 @@ macro(config_compiler_and_linker)
else() else()
set(GTEST_HAS_PTHREAD_MACRO "-DGTEST_HAS_PTHREAD=0") set(GTEST_HAS_PTHREAD_MACRO "-DGTEST_HAS_PTHREAD=0")
endif() endif()
set(cxx_base_flags "${cxx_base_flags} ${GTEST_HAS_PTHREAD_MACRO}")
# For building gtest's own tests and samples. # For building gtest's own tests and samples.
set(cxx_exception "${cxx_base_flags} ${cxx_exception_flags}") set(cxx_exception "${cxx_base_flags} ${cxx_exception_flags}")
@ -151,6 +150,7 @@ function(cxx_library_with_type name type cxx_flags)
# ARGN refers to additional arguments after 'cxx_flags'. # ARGN refers to additional arguments after 'cxx_flags'.
add_library(${name} ${type} ${ARGN}) add_library(${name} ${type} ${ARGN})
add_library(${cmake_package_name}::${name} ALIAS ${name}) add_library(${cmake_package_name}::${name} ALIAS ${name})
target_compile_definitions(${name} PUBLIC "${GTEST_HAS_PTHREAD_MACRO}")
set_target_properties(${name} set_target_properties(${name}
PROPERTIES PROPERTIES
COMPILE_FLAGS "${cxx_flags}") COMPILE_FLAGS "${cxx_flags}")