2024-11-14 11:30:13 +01:00
|
|
|
diff --git a/cmake/install.cmake b/cmake/install.cmake
|
2024-11-20 03:55:42 +01:00
|
|
|
index 65765ca29..f5ad69102 100644
|
2024-11-14 11:30:13 +01:00
|
|
|
--- a/cmake/install.cmake
|
|
|
|
|
+++ b/cmake/install.cmake
|
2024-11-20 03:55:42 +01:00
|
|
|
@@ -61,7 +61,7 @@ if (protobuf_BUILD_PROTOC_BINARIES)
|
|
|
|
|
endforeach ()
|
|
|
|
|
endif ()
|
|
|
|
|
foreach (binary IN LISTS _protobuf_binaries)
|
|
|
|
|
- if (UNIX AND NOT APPLE)
|
|
|
|
|
+ if (UNIX AND NOT APPLE AND NOT protobuf_MSVC_STATIC_RUNTIME)
|
|
|
|
|
set_property(TARGET ${binary}
|
|
|
|
|
PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
|
|
|
|
|
elseif (APPLE)
|
|
|
|
|
@@ -81,7 +81,6 @@ set(protobuf_HEADERS
|
2024-11-14 11:30:13 +01:00
|
|
|
${cpp_features_proto_proto_srcs}
|
|
|
|
|
${descriptor_proto_proto_srcs}
|
|
|
|
|
${plugin_proto_proto_srcs}
|
|
|
|
|
- ${java_features_proto_proto_srcs}
|
|
|
|
|
)
|
2024-11-20 03:55:42 +01:00
|
|
|
if (protobuf_BUILD_LIBUPB)
|
|
|
|
|
list(APPEND protobuf_HEADERS ${libupb_hdrs})
|
