diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2019-12-13 13:07:06 +0100 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2019-12-13 13:07:06 +0100 |
| commit | e040dedf487492de6191b77c0e664cae7f0889d2 (patch) | |
| tree | e1d4b90fab9f823910d2023d2fa53241d460daad /dev-ros | |
| parent | dev-ros/qt_gui_cpp: Remove old (diff) | |
| download | gentoo-e040dedf487492de6191b77c0e664cae7f0889d2.tar.gz gentoo-e040dedf487492de6191b77c0e664cae7f0889d2.tar.bz2 gentoo-e040dedf487492de6191b77c0e664cae7f0889d2.zip | |
dev-ros/qt_gui_cpp: fix libdir patch
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
Diffstat (limited to 'dev-ros')
| -rw-r--r-- | dev-ros/qt_gui_cpp/files/libdir.patch | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/dev-ros/qt_gui_cpp/files/libdir.patch b/dev-ros/qt_gui_cpp/files/libdir.patch index 8c22eed2385c..b2656183de95 100644 --- a/dev-ros/qt_gui_cpp/files/libdir.patch +++ b/dev-ros/qt_gui_cpp/files/libdir.patch @@ -1,15 +1,13 @@ -Index: qt_gui_core-0.2.26/qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt +Index: qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt =================================================================== ---- qt_gui_core-0.2.26.orig/qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt -+++ qt_gui_core-0.2.26/qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt -@@ -29,8 +29,8 @@ set(qt_gui_cpp_sip_DEPENDENT_FILES +--- qt_gui_cpp.orig/src/qt_gui_cpp_sip/CMakeLists.txt ++++ qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt +@@ -29,7 +29,7 @@ set(qt_gui_cpp_sip_DEPENDENT_FILES # maintain context for different named target set(qt_gui_cpp_sip_INCLUDE_DIRS ${qt_gui_cpp_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/../../include" ${catkin_INCLUDE_DIRS}) set(qt_gui_cpp_sip_LIBRARIES ${qt_gui_cpp_LIBRARIES} ${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES}) -set(qt_gui_cpp_sip_LIBRARY_DIRS ${qt_gui_cpp_LIBRARY_DIRS} ${CATKIN_DEVEL_PREFIX}/lib) --set(qt_gui_cpp_sip_LDFLAGS_OTHER ${qt_gui_cpp_LDFLAGS_OTHER} -Wl,-rpath,\\"${CATKIN_DEVEL_PREFIX}/lib\\") +set(qt_gui_cpp_sip_LIBRARY_DIRS ${qt_gui_cpp_LIBRARY_DIRS} ${CATKIN_DEVEL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) -+set(qt_gui_cpp_sip_LDFLAGS_OTHER ${qt_gui_cpp_LDFLAGS_OTHER} -Wl,-rpath,\\"${CATKIN_DEVEL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\\") + set(qt_gui_cpp_sip_LDFLAGS_OTHER ${qt_gui_cpp_LDFLAGS_OTHER}) find_package(python_qt_binding REQUIRED) - include(${python_qt_binding_EXTRAS_DIR}/sip_helper.cmake) |