Changeset 8318 for code/branches/kicklib2
- Timestamp:
- Apr 24, 2011, 5:48:53 AM (14 years ago)
- Location:
- code/branches/kicklib2
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/kicklib2/cmake/InstallConfig.cmake
r8317 r8318 71 71 ################## Unix rpath ################### 72 72 73 # Use, i.e. don't skip the full RPATH for the build tree 74 SET(CMAKE_SKIP_BUILD_RPATH FALSE) 75 73 76 # When building, don't use the install RPATH already 74 77 # (but later on when installing) … … 77 80 # The RPATH to be used when installing 78 81 IF(INSTALL_COPYABLE) 79 SET(CMAKE_INSTALL_RPATH ${DEFAULT_LIBRARY_PATH}) 82 # Get relative paths from run to lib and from module to lib directory. 83 FILE(RELATIVE_PATH _runtime_rpath "/${RUNTIME_INSTALL_DIRECTORY}" "/${LIBRARY_INSTALL_DIRECTORY}") 84 FILE(RELATIVE_PATH _module_rpath "/${MODULE_INSTALL_DIRECTORY}" "/${LIBRARY_INSTALL_DIRECTORY}") 85 # $ORIGIN (with $ escaped) refers to the actual location of the library 86 # The UNIX loader recognises this special variable 87 SET(RUNTIME_RPATH "\$ORIGIN/${_runtime_rpath}") 88 SET(LIBRARY_RPATH "\$ORIGIN") 89 SET(MODULE_RPATH "\$ORIGIN:\$ORIGIN/${_module_rpath}") 80 90 ELSE() 81 SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${LIBRARY_INSTALL_DIRECTORY}) 91 SET(RUNTIME_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBRARY_INSTALL_DIRECTORY}") 92 SET(LIBRARY_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBRARY_INSTALL_DIRECTORY}") 93 SET(MODULE_RPATH "${LIBRARY_RPATH}:${CMAKE_INSTALL_PREFIX}/${MODULE_INSTALL_DIRECTORY}") 82 94 ENDIF() 83 95 -
code/branches/kicklib2/cmake/tools/TargetUtilities.cmake
r8317 r8318 288 288 289 289 # RPATH settings for the installation 290 IF(UNIX) 291 SET(_rpath ${CMAKE_INSTALL_PREFIX}/${LIBRARY_INSTALL_DIRECTORY}) 290 IF(_target_type STREQUAL "LIBRARY") 292 291 IF(_arg_MODULE) 293 LIST(APPEND _rpath ${CMAKE_INSTALL_PREFIX}/${MODULE_INSTALL_DIRECTORY}) 294 ENDIF() 295 SET_TARGET_PROPERTIES(${_target_name} PROPERTIES INSTALL_RPATH "${_rpath}") 296 ENDIF() 292 SET(_rpath "${MODULE_RPATH}") 293 ELSE() 294 SET(_rpath "${LIBRARY_RPATH}") 295 ENDIF() 296 ELSE() 297 SET(_rpath "${RUNTIME_RPATH}") 298 ENDIF() 299 SET_TARGET_PROPERTIES(${_target_name} PROPERTIES INSTALL_RPATH "${_rpath}") 297 300 298 301 # DEFINE_SYMBOL -
code/branches/kicklib2/src/OrxonoxConfig.cmake
r8285 r8318 27 27 28 28 #################### Options #################### 29 30 # Use, i.e. don't skip the full RPATH for the build tree31 SET(CMAKE_SKIP_BUILD_RPATH FALSE)32 29 33 30 # Global switch to disable Precompiled Header Files
Note: See TracChangeset
for help on using the changeset viewer.