cmake: googletest patch fixup

google · Feb 5, 2025 · 36f9afe · 36f9afe
1 parent 3bbfde4
commit 36f9afe
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/patches/googletest-v1.15.2.patch b/patches/googletest-v1.15.2.patch
@@ -1,3 +1,18 @@
+diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
+index 99b2411..cd17813 100644
+--- a/googlemock/CMakeLists.txt
++++ b/googlemock/CMakeLists.txt
+@@ -109,6 +109,10 @@ target_include_directories(gmock SYSTEM INTERFACE
+ target_include_directories(gmock_main SYSTEM INTERFACE
+   "$<BUILD_INTERFACE:${dirs}>"
+   "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
++if (BUILD_SHARED_LIBS)
++  target_compile_definitions(gmock_main INTERFACE
++    $<BUILD_INTERFACE:GTEST_LINKED_AS_SHARED_LIBRARY=1>)
++endif()
+
+ ########################################################################
+ #
 diff --git a/googlemock/include/gmock/internal/gmock-port.h b/googlemock/include/gmock/internal/gmock-port.h
 index e9d9e32..ca55646 100644
 --- a/googlemock/include/gmock/internal/gmock-port.h
@@ -18,14 +33,14 @@ index e9d9e32..ca55646 100644
  #define GMOCK_FLAG_GET(name) ::absl::GetFlag(GMOCK_FLAG(name))
  #define GMOCK_FLAG_SET(name, value) \
 diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt
-index dce6a7c..65bfab2 100644
+index dce6a7c..80888db 100644
 --- a/googletest/CMakeLists.txt
 +++ b/googletest/CMakeLists.txt
 @@ -147,6 +147,10 @@ target_include_directories(gtest SYSTEM INTERFACE
  target_include_directories(gtest_main SYSTEM INTERFACE
    "$<BUILD_INTERFACE:${dirs}>"
    "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
-+if (BUILD_SHARED_LIBS OR type STREQUAL "SHARED")
++if (BUILD_SHARED_LIBS)
 +  target_compile_definitions(gtest_main INTERFACE
 +    $<BUILD_INTERFACE:GTEST_LINKED_AS_SHARED_LIBRARY=1>)
 +endif()