# HG changeset patch # User koda # Date 1371058037 -7200 # Node ID 29372f16ddceeccda3f01eabf88dd0d6b37ceb39 # Parent ec72ef9186f5dc1d4aac321a512a3654d213486f explicitly set the origin linker flag so that $ORIGIN is used correctly diff -r ec72ef9186f5 -r 29372f16ddce cmake_modules/paths.cmake --- a/cmake_modules/paths.cmake Wed Jun 12 18:48:34 2013 +0200 +++ b/cmake_modules/paths.cmake Wed Jun 12 19:27:17 2013 +0200 @@ -50,8 +50,11 @@ set(CMAKE_INSTALL_RPATH_ESCAPED "$$ORIGIN/../${target_library_install_dir}/:$$ORIGIN/:${CMAKE_INSTALL_PREFIX}/${target_library_install_dir}/") if(UNIX AND NOT APPLE) - list(APPEND pascal_flags "-k-rpath" "-k'${CMAKE_INSTALL_RPATH_ESCAPED}'") - list(APPEND haskell_flags "-optl" "-Wl,-rpath,'${CMAKE_INSTALL_RPATH_ESCAPED}'") + list(APPEND pascal_flags "-k-rpath" "-k'${CMAKE_INSTALL_RPATH_ESCAPED}'" "-k-z" "-korigin") + list(APPEND haskell_flags "-optl" "-Wl,-rpath,'${CMAKE_INSTALL_RPATH_ESCAPED},-z,origin'") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,origin") + set(CMAKE_SHARED_LIBRARY_C_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS} -Wl,-z,origin") + set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS} -Wl,-z,origin") endif() #add the automatically determined parts of the RPATH