googletest icon indicating copy to clipboard operation
googletest copied to clipboard

Properly export GTEST_HAS_PTHREAD compile definition with CMake

Open dalg24 opened this issue 4 years ago • 3 comments

Fix #3692

--- <prefix_main>/lib/cmake/GTest/GTestTargets.cmake
+++ <prefix_thispr>/lib/cmake/GTest/GTestTargets.cmake
@@ -54,7 +54,6 @@
 add_library(GTest::gtest STATIC IMPORTED)

 set_target_properties(GTest::gtest PROPERTIES
+  INTERFACE_COMPILE_DEFINITIONS "GTEST_HAS_PTHREAD=0"
   INTERFACE_COMPILE_FEATURES "cxx_std_11"
   INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
   INTERFACE_LINK_LIBRARIES "Threads::Threads"
@@ -65,7 +64,6 @@
 add_library(GTest::gtest_main STATIC IMPORTED)

 set_target_properties(GTest::gtest_main PROPERTIES
+  INTERFACE_COMPILE_DEFINITIONS "GTEST_HAS_PTHREAD=0"
   INTERFACE_COMPILE_FEATURES "cxx_std_11"
   INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
   INTERFACE_LINK_LIBRARIES "Threads::Threads;GTest::gtest"
@@ -76,7 +74,6 @@
 add_library(GTest::gmock STATIC IMPORTED)

 set_target_properties(GTest::gmock PROPERTIES
+  INTERFACE_COMPILE_DEFINITIONS "GTEST_HAS_PTHREAD=0"
   INTERFACE_COMPILE_FEATURES "cxx_std_11"
   INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
   INTERFACE_LINK_LIBRARIES "Threads::Threads;GTest::gtest"
@@ -87,7 +84,6 @@
 add_library(GTest::gmock_main STATIC IMPORTED)

 set_target_properties(GTest::gmock_main PROPERTIES
+  INTERFACE_COMPILE_DEFINITIONS "GTEST_HAS_PTHREAD=0"
   INTERFACE_COMPILE_FEATURES "cxx_std_11"
   INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
   INTERFACE_LINK_LIBRARIES "Threads::Threads;GTest::gmock"

dalg24 avatar Dec 03 '21 17:12 dalg24

Ping

dalg24 avatar Dec 17 '21 15:12 dalg24

How can we make progress on this?

dalg24 avatar Jan 19 '22 20:01 dalg24

@derekmauro this is still an issue on our side. Would you please review?

dalg24 avatar Jun 02 '22 21:06 dalg24