From 36f9afe5ff8b12886a2ba3f867556d2428cb2820 Mon Sep 17 00:00:00 2001 From: Mizux Seiha Date: Wed, 5 Feb 2025 21:36:36 +0100 Subject: [PATCH] cmake: googletest patch fixup --- patches/googletest-v1.15.2.patch | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/patches/googletest-v1.15.2.patch b/patches/googletest-v1.15.2.patch index ec15e0852f..1e40ca720f 100644 --- 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 + "$" + "$/${CMAKE_INSTALL_INCLUDEDIR}>") ++if (BUILD_SHARED_LIBS) ++ target_compile_definitions(gmock_main INTERFACE ++ $) ++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 "$" "$/${CMAKE_INSTALL_INCLUDEDIR}>") -+if (BUILD_SHARED_LIBS OR type STREQUAL "SHARED") ++if (BUILD_SHARED_LIBS) + target_compile_definitions(gtest_main INTERFACE + $) +endif()