Skip to content

Commit dba6cda

Browse files
committed
cmake: googletest patch fixup
1 parent 5ccb262 commit dba6cda

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

patches/googletest-v1.15.2.patch

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
2+
index 99b2411..cd17813 100644
3+
--- a/googlemock/CMakeLists.txt
4+
+++ b/googlemock/CMakeLists.txt
5+
@@ -109,6 +109,10 @@ target_include_directories(gmock SYSTEM INTERFACE
6+
target_include_directories(gmock_main SYSTEM INTERFACE
7+
"$<BUILD_INTERFACE:${dirs}>"
8+
"$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
9+
+if (BUILD_SHARED_LIBS)
10+
+ target_compile_definitions(gmock_main INTERFACE
11+
+ $<BUILD_INTERFACE:GTEST_LINKED_AS_SHARED_LIBRARY=1>)
12+
+endif()
13+
14+
########################################################################
15+
#
116
diff --git a/googlemock/include/gmock/internal/gmock-port.h b/googlemock/include/gmock/internal/gmock-port.h
217
index e9d9e32..ca55646 100644
318
--- a/googlemock/include/gmock/internal/gmock-port.h
@@ -18,14 +33,14 @@ index e9d9e32..ca55646 100644
1833
#define GMOCK_FLAG_GET(name) ::absl::GetFlag(GMOCK_FLAG(name))
1934
#define GMOCK_FLAG_SET(name, value) \
2035
diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt
21-
index dce6a7c..65bfab2 100644
36+
index dce6a7c..80888db 100644
2237
--- a/googletest/CMakeLists.txt
2338
+++ b/googletest/CMakeLists.txt
2439
@@ -147,6 +147,10 @@ target_include_directories(gtest SYSTEM INTERFACE
2540
target_include_directories(gtest_main SYSTEM INTERFACE
2641
"$<BUILD_INTERFACE:${dirs}>"
2742
"$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
28-
+if (BUILD_SHARED_LIBS OR type STREQUAL "SHARED")
43+
+if (BUILD_SHARED_LIBS)
2944
+ target_compile_definitions(gtest_main INTERFACE
3045
+ $<BUILD_INTERFACE:GTEST_LINKED_AS_SHARED_LIBRARY=1>)
3146
+endif()

0 commit comments

Comments
 (0)