From 2f93b132a63e25e3cece330ebaf16de7a8aa9517 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Sat, 26 Sep 2015 11:39:39 +0200 Subject: [PATCH] python_bindings: sip: Use CATKIN_PACKAGE_LIB_DESTINATION instead of hardcoded lib. Fixes build with libdir != lib. https://bugs.gentoo.org/show_bug.cgi?id=561480 --- src/python_bindings/sip/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/python_bindings/sip/CMakeLists.txt b/src/python_bindings/sip/CMakeLists.txt index 6b0c9391ae..c91a6be254 100644 --- a/src/python_bindings/sip/CMakeLists.txt +++ b/src/python_bindings/sip/CMakeLists.txt @@ -42,8 +42,8 @@ include(${python_qt_binding_EXTRAS_DIR}/sip_helper.cmake) # maintain context for different named target set(rviz_sip_INCLUDE_DIRS ${rviz_INCLUDE_DIRS} "${PROJECT_SOURCE_DIR}/src" ${catkin_INCLUDE_DIRS}) set(rviz_sip_LIBRARIES ${rviz_LIBRARIES} ${PROJECT_NAME}) -set(rviz_sip_LIBRARY_DIRS ${rviz_LIBRARY_DIRS} ${CATKIN_DEVEL_PREFIX}/lib) -set(rviz_sip_LDFLAGS_OTHER ${rviz_LDFLAGS_OTHER} -Wl,-rpath,\\"${CATKIN_DEVEL_PREFIX}/lib\\") +set(rviz_sip_LIBRARY_DIRS ${rviz_LIBRARY_DIRS} ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_LIB_DESTINATION}) +set(rviz_sip_LDFLAGS_OTHER ${rviz_LDFLAGS_OTHER} -Wl,-rpath,\\"${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_LIB_DESTINATION}\\") if(sip_helper_FOUND) list(APPEND rviz_BINDINGS "sip")