From e114c9df656a5fd91662ae124573fb30cfdc3f39 Mon Sep 17 00:00:00 2001 From: Steven Peters Date: Mon, 28 Apr 2014 15:24:38 -0700 Subject: [PATCH] Use CATKIN_GLOBAL_LIB_DESTINATION and os.path.join --- cmake/catkin_generate_environment.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/catkin_generate_environment.cmake b/cmake/catkin_generate_environment.cmake index 2030866c5..a54e27e44 100644 --- a/cmake/catkin_generate_environment.cmake +++ b/cmake/catkin_generate_environment.cmake @@ -11,16 +11,16 @@ function(catkin_generate_environment) endif() # get multiarch name - set(CATKIN_MULTIARCH_LIB_DESTINATION "'lib'") - set(CATKIN_MULTIARCH_PKGCONFIG_DESTINATION "'lib/pkgconfig'") + set(CATKIN_MULTIARCH_LIB_DESTINATION "'${CATKIN_GLOBAL_LIB_DESTINATION}'") + set(CATKIN_MULTIARCH_PKGCONFIG_DESTINATION "os.path.join('${CATKIN_GLOBAL_LIB_DESTINATION}', 'pkgconfig')") if (UNIX) execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH OUTPUT_VARIABLE CATKIN_MULTIARCH OUTPUT_STRIP_TRAILING_WHITESPACE ) if (NOT "${CATKIN_MULTIARCH}" STREQUAL "") - set(CATKIN_MULTIARCH_LIB_DESTINATION "['lib', 'lib/${CATKIN_MULTIARCH}']") - set(CATKIN_MULTIARCH_PKGCONFIG_DESTINATION "['lib/pkgconfig', 'lib/${CATKIN_MULTIARCH}/pkgconfig']") + set(CATKIN_MULTIARCH_LIB_DESTINATION "['${CATKIN_GLOBAL_LIB_DESTINATION}', os.path.join('${CATKIN_GLOBAL_LIB_DESTINATION}', '${CATKIN_MULTIARCH}')]") + set(CATKIN_MULTIARCH_PKGCONFIG_DESTINATION "[os.path.join('${CATKIN_GLOBAL_LIB_DESTINATION}', 'pkgconfig'), os.path.join('${CATKIN_GLOBAL_LIB_DESTINATION}', '${CATKIN_MULTIARCH}', 'pkgconfig')]") endif() endif()