mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-15 15:48:01 +08:00
22 lines
890 B
Diff
22 lines
890 B
Diff
diff --git a/cmake/install.cmake b/cmake/install.cmake
|
|
index 52914a8ea..e7c22ddb6 100644
|
|
--- a/cmake/install.cmake
|
|
+++ b/cmake/install.cmake
|
|
@@ -49,7 +49,7 @@ if (protobuf_BUILD_PROTOC_BINARIES)
|
|
install(TARGETS protoc EXPORT protobuf-targets
|
|
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc
|
|
BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc)
|
|
- if (UNIX AND NOT APPLE)
|
|
+ if (UNIX AND NOT APPLE AND NOT protobuf_MSVC_STATIC_RUNTIME)
|
|
set_property(TARGET protoc
|
|
PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
|
|
elseif (APPLE)
|
|
@@ -68,7 +68,6 @@ set(protobuf_HEADERS
|
|
${cpp_features_proto_proto_srcs}
|
|
${descriptor_proto_proto_srcs}
|
|
${plugin_proto_proto_srcs}
|
|
- ${java_features_proto_proto_srcs}
|
|
)
|
|
foreach(_header ${protobuf_HEADERS})
|
|
string(FIND ${_header} "${protobuf_SOURCE_DIR}/src" _find_src)
|