dev-ros/qt_gui_cpp: fix libdir patch
authorAlexis Ballier <aballier@gentoo.org>
Fri, 13 Dec 2019 12:07:06 +0000 (13:07 +0100)
committerAlexis Ballier <aballier@gentoo.org>
Fri, 13 Dec 2019 12:07:06 +0000 (13:07 +0100)
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
dev-ros/qt_gui_cpp/files/libdir.patch

index 8c22eed2385cd9056e1800d6f5eab02ce5b063d4..b2656183de959d1d0a3f1bc55b56811365f6e6e8 100644 (file)
@@ -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)