mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-11 23:59:08 +08:00
087ef910dd
* [protobuf] Update to 3.20.1 * x-add-version * [protobuf] Fix Linux build error * x-add-version * update protobuf to 3.21.2 and fix build error * x-add-version * Update protobuf.json * add version * x-add-version * fix gazebo build error * x-add-version * update gazebo version * update versions db Co-authored-by: Lily Wang <v-lilywang@microsoft.com> Co-authored-by: Victor Romero <viromer@microsoft.com>
14 lines
582 B
Diff
14 lines
582 B
Diff
diff --git a/cmake/install.cmake b/cmake/install.cmake
|
|
index 825cb25..4f453d6 100644
|
|
--- a/cmake/install.cmake
|
|
+++ b/cmake/install.cmake
|
|
@@ -32,7 +32,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)
|