cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

protobuf: Update to version 3.13.0

Browse Source 
Signed-off-by: Bruno Randolf <br1@einfach.org>
This commit is contained in:
Bruno Randolf
2020-11-02 15:30:19 +00:00
parent 2d8029ad62
commit 66ace3b968
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/protobuf/patches/010-rpath.patch
+7 -5
View File
@@ -1,12 +1,14 @@
--- a/cmake/install.cmake
+++ b/cmake/install.cmake
Index: protobuf-3.13.0/cmake/install.cmake
===================================================================
--- protobuf-3.13.0.orig/cmake/install.cmake
+++ protobuf-3.13.0/cmake/install.cmake
@@ -16,8 +16,8 @@ foreach(_library ${_protobuf_libraries})
$<BUILD_INTERFACE:${protobuf_source_dir}/src>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
if (UNIX AND NOT APPLE)
- set_property(TARGET ${_library}
- PROPERTY INSTALL_RPATH "$ORIGIN")
+# set_property(TARGET ${_library}
+# set_property(TARGET ${_library}
+# PROPERTY INSTALL_RPATH "$ORIGIN")
elseif (APPLE)
set_property(TARGET ${_library}
@@ -16,9 +18,9 @@
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc)
if (UNIX AND NOT APPLE)
- set_property(TARGET protoc
- PROPERTY INSTALL_RPATH "$ORIGIN/../lib")
- PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
+# set_property(TARGET protoc
+# PROPERTY INSTALL_RPATH "$ORIGIN/../lib")
+# PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
elseif (APPLE)
set_property(TARGET protoc
PROPERTY INSTALL_RPATH "@loader_path/../lib")