# HG changeset patch # User koda # Date 1371217675 -7200 # Node ID 571e55b32da57bc3031dfa5c5a98f79d6fd69fbb # Parent e704a6a5101a54f5c47a99e652932ad090cab91f there is no need of escaping after all... diff -r e704a6a5101a -r 571e55b32da5 cmake_modules/paths.cmake --- a/cmake_modules/paths.cmake Fri Jun 14 01:24:41 2013 +0200 +++ b/cmake_modules/paths.cmake Fri Jun 14 15:47:55 2013 +0200 @@ -57,14 +57,15 @@ # - the third one is the full path of the system dir #source http://www.cmake.org/pipermail/cmake/2008-January/019290.html set(CMAKE_INSTALL_RPATH "$ORIGIN/../${target_library_install_dir}/:$ORIGIN/:${CMAKE_INSTALL_PREFIX}/${target_library_install_dir}/") -set(CMAKE_INSTALL_RPATH_ESCAPED "$$ORIGIN/../${target_library_install_dir}/:$$ORIGIN/:${CMAKE_INSTALL_PREFIX}/${target_library_install_dir}/") if(UNIX AND NOT APPLE) #make sure $ORIGIN is respected add_linker_flag("-zorigin") - #apply RPATH settings to pascal and haskell executables - add_flag_append(CMAKE_Pascal_FLAGS "-k-rpath -k'${CMAKE_INSTALL_RPATH_ESCAPED}'") - list(APPEND haskell_flags "-optl" "-Wl,-rpath,'${CMAKE_INSTALL_RPATH_ESCAPED}'") + #apply RPATH settings to pascal executables + add_flag_append(CMAKE_Pascal_FLAGS "-k-rpath -k'${CMAKE_INSTALL_RPATH}'") + #until we link with external things there is no need to set rpath on haskell + #should you need it remember to escape $ with $$ + #list(APPEND haskell_flags "-optl" "-Wl,-rpath,'${CMAKE_INSTALL_RPATH_ESCAPED}'") endif() #add the automatically determined parts of the RPATH