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/Import/App/CMakeLists.txt
+++ b/src/Mod/Import/App/CMakeLists.txt
@@ -42,4 +42,8 @@ target_link_libraries(Import ${Import_LIBS})

 set_target_properties(Import PROPERTIES SUFFIX ".pyd")

+if(UNIX)
+    set_target_properties(Import PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
+endif(UNIX)
+
 install(TARGETS Import DESTINATION lib)
--- a/src/Mod/Import/CMakeLists.txt
+++ b/src/Mod/Import/CMakeLists.txt
@@ -4,10 +4,10 @@ if(FREECAD_BUILD_GUI)
    add_subdirectory(Gui)
 endif(FREECAD_BUILD_GUI)

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

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