Mercurial Mercurial > sheepy-clone / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
explicitly set the origin linker flag so that $ORIGIN is used correctly
authorkoda
Wed, 12 Jun 2013 19:27:17 +0200
changeset 9216 29372f16ddce
parent 9215 ec72ef9186f5
child 9217 992b7ef2eba3
explicitly set the origin linker flag so that $ORIGIN is used correctly
cmake_modules/paths.cmake file | annotate | diff | comparison | revisions 
--- 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
sheepy-clone