[protobuf] fix dynamic build #25744
Closed
[protobuf] fix dynamic build #25744
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
cenit
reviewed
Jul 13, 2022
Comment on lines
12
to
16
| --- a/cmake/install.cmake | ||
| +++ b/cmake/install.cmake | ||
| @@ -32,9 +32,9 @@ 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}") | ||
| + PROPERTY INSTALL_RPATH "$ORIGIN:$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:$ORIGIN/../../${CMAKE_INSTALL_LIBDIR}") | ||
| elseif (APPLE) | ||
| set_property(TARGET protoc | ||
| PROPERTY INSTALL_RPATH "@loader_path/../lib") |
There was a problem hiding this comment.
only this part of patch file should survive, everything else around is an unnecessary waste of storage space in the long term
There was a problem hiding this comment.
thx for suggestion. :)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe the pull request
What does your PR fix?
Fix failure of dynamic build.
Which triplets are supported/not supported? Have you updated the CI baseline?
all, No
Does your PR follow the maintainer guide?
Basically
If you have added/updated a port: Have you run
./vcpkg x-add-version --alland committed the result?Yes
If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/