mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 08:49:00 +08:00
b29f8ef37e
* [protobuf] upgrade to latest release (v3.18.0) This requires patching OpenCV as it uses a function removed in the latest version of protobuf (FWIW, upstream OpenCV has a similar patch). * The arcus port also needs a patch * The caffe2 port also needs a patch * The brpc port also needs a patch
14 lines
520 B
Diff
14 lines
520 B
Diff
diff --git a/cmake/install.cmake b/cmake/install.cmake
|
|
index ef5bb13..e2d4acb 100644
|
|
--- a/cmake/install.cmake
|
|
+++ b/cmake/install.cmake
|
|
@@ -33,7 +33,7 @@ if (protobuf_BUILD_PROTOC_BINARIES)
|
|
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
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)
|