Use CATKIN_GLOBAL_LIB_DESTINATION and os.path.join

scpeters · Apr 28, 2014 · e114c9d · e114c9d
1 parent 6f89efe
commit e114c9d
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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()