From 10fa6ff3f28e357865003dd91008f89963d6f724 Mon Sep 17 00:00:00 2001 From: Damien L-G Date: Fri, 3 Dec 2021 12:26:57 -0500 Subject: [PATCH] Properly export GTEST_HAS_PTHREAD compile definition with CMake --- googletest/cmake/internal_utils.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake index 58fc9bfb..68da0106 100644 --- a/googletest/cmake/internal_utils.cmake +++ b/googletest/cmake/internal_utils.cmake @@ -131,7 +131,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}") @@ -151,6 +150,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}")