|
@ -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})
|
|
|
@@ -16,8 +16,8 @@ foreach(_library ${_protobuf_libraries})
|
|
|
$<BUILD_INTERFACE:${protobuf_source_dir}/src> |
|
|
$<BUILD_INTERFACE:${protobuf_source_dir}/src> |
|
|
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) |
|
|
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) |
|
|
if (UNIX AND NOT APPLE) |
|
|
if (UNIX AND NOT APPLE) |
|
|
- set_property(TARGET ${_library}
|
|
|
- set_property(TARGET ${_library}
|
|
|
- PROPERTY INSTALL_RPATH "$ORIGIN")
|
|
|
- PROPERTY INSTALL_RPATH "$ORIGIN")
|
|
|
+# set_property(TARGET ${_library}
|
|
|
|
|
|
|
|
|
+# set_property(TARGET ${_library}
|
|
|
+# PROPERTY INSTALL_RPATH "$ORIGIN")
|
|
|
+# PROPERTY INSTALL_RPATH "$ORIGIN")
|
|
|
elseif (APPLE) |
|
|
elseif (APPLE) |
|
|
set_property(TARGET ${_library} |
|
|
set_property(TARGET ${_library} |
|
@ -16,9 +18,9 @@ |
|
|
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc) |
|
|
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc) |
|
|
if (UNIX AND NOT APPLE) |
|
|
if (UNIX AND NOT APPLE) |
|
|
- set_property(TARGET protoc
|
|
|
- set_property(TARGET protoc
|
|
|
- PROPERTY INSTALL_RPATH "$ORIGIN/../lib")
|
|
|
|
|
|
|
|
|
- PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
|
|
|
+# set_property(TARGET protoc
|
|
|
+# set_property(TARGET protoc
|
|
|
+# PROPERTY INSTALL_RPATH "$ORIGIN/../lib")
|
|
|
|
|
|
|
|
|
+# PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
|
|
|
elseif (APPLE) |
|
|
elseif (APPLE) |
|
|
set_property(TARGET protoc |
|
|
set_property(TARGET protoc |
|
|
PROPERTY INSTALL_RPATH "@loader_path/../lib") |
|
|
PROPERTY INSTALL_RPATH "@loader_path/../lib") |