0000519: Patch to set proper RPATH's for system wide installation on Linux

git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5270 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d
2011-12-11 12:36:36 +00:00
parent de66587251
commit bde949f7e4
74 changed files with 195 additions and 129 deletions
--- a/src/Mod/Sandbox/App/CMakeLists.txt
+++ b/src/Mod/Sandbox/App/CMakeLists.txt
@@ -46,6 +46,7 @@ elseif(MINGW)
 else(MSVC)
    set_target_properties(Sandbox PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Sandbox)
    set_target_properties(Sandbox PROPERTIES PREFIX "")
+    set_target_properties(Sandbox PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
 endif(MSVC)

-install(TARGETS Sandbox DESTINATION lib)
+INSTALL(TARGETS Sandbox DESTINATION lib)
--- a/src/Mod/Sandbox/CMakeLists.txt
+++ b/src/Mod/Sandbox/CMakeLists.txt
@@ -4,10 +4,10 @@ if(FREECAD_BUILD_GUI)
 	add_subdirectory(Gui)
 endif(FREECAD_BUILD_GUI)

-install(
-	FILES
-		Init.py
-		InitGui.py
-	DESTINATION
-		Mod/Sandbox
+INSTALL(
+    FILES
+        Init.py
+        InitGui.py
+    DESTINATION
+        Mod/Sandbox
 )
--- a/src/Mod/Sandbox/Gui/CMakeLists.txt
+++ b/src/Mod/Sandbox/Gui/CMakeLists.txt
@@ -57,6 +57,7 @@ elseif(MINGW)
 else(MSVC)
    set_target_properties(SandboxGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Sandbox)
    set_target_properties(SandboxGui PROPERTIES PREFIX "")
+    set_target_properties(SandboxGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
 endif(MSVC)

-install(TARGETS SandboxGui DESTINATION lib)
+INSTALL(TARGETS SandboxGui DESTINATION lib)