Changeset 8318 for code/branches/kicklib2/cmake/tools

Timestamp:

Apr 24, 2011, 5:48:53 AM (14 years ago)

Author:

rgrieder

Message:

RPATH handling was broken in certain cases, esp. for "turn-key" (INSTALL_COPYABLE) installations.
Fixed by using the "$ORIGIN" token and distinguishing between executable, library and module when setting the RPATH.

File:

• code/branches/kicklib2/cmake/tools/TargetUtilities.cmake (modified) (1 diff)

code/branches/kicklib2/cmake/tools/TargetUtilities.cmake

@@ -288 +288 @@
 
   # RPATH settings for the installation
-  IF(UNIX)
-    SET(_rpath ${CMAKE_INSTALL_PREFIX}/${LIBRARY_INSTALL_DIRECTORY})
+  IF(_target_type STREQUAL "LIBRARY")
     IF(_arg_MODULE)
-      LIST(APPEND _rpath ${CMAKE_INSTALL_PREFIX}/${MODULE_INSTALL_DIRECTORY})
-    ENDIF()
-    SET_TARGET_PROPERTIES(${_target_name} PROPERTIES INSTALL_RPATH "${_rpath}")
-  ENDIF()
+      SET(_rpath "${MODULE_RPATH}")
+    ELSE()
+      SET(_rpath "${LIBRARY_RPATH}")
+    ENDIF()
+  ELSE()
+    SET(_rpath "${RUNTIME_RPATH}")
+  ENDIF()
+  SET_TARGET_PROPERTIES(${_target_name} PROPERTIES INSTALL_RPATH "${_rpath}")
 
   # DEFINE_SYMBOL