kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

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

Browse Source 
git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5270 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d
This commit is contained in:
wmayer
2011-12-11 12:36:36 +00:00
parent de66587251
commit bde949f7e4
74 changed files with 195 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Main/CMakeLists.txt
View File

@@ -59,6 +59,7 @@ if(FREECAD_BUILD_GUI)
else(MSVC)
set_target_properties(FreeCADMain PROPERTIES OUTPUT_NAME "FreeCAD")
set_target_properties(FreeCADMain PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set_target_properties(FreeCADMain PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
if(WIN32)
@@ -99,6 +100,7 @@ elseif(MINGW)
else(MSVC)
set_target_properties(FreeCADMainCmd PROPERTIES OUTPUT_NAME "FreeCADCmd")
set_target_properties(FreeCADMainCmd PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set_target_properties(FreeCADMainCmd PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
if(WIN32)
@@ -140,6 +142,7 @@ else(MSVC)
set_target_properties(FreeCADMainPy PROPERTIES OUTPUT_NAME "FreeCAD")
set_target_properties(FreeCADMainPy PROPERTIES PREFIX "")
set_target_properties(FreeCADMainPy PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set_target_properties(FreeCADMainPy PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
if(WIN32)
@@ -178,10 +181,12 @@ if(FREECAD_BUILD_GUI)
set_target_properties(FreeCADGuiPy PROPERTIES SUFFIX ".pyd")
set_target_properties(FreeCADGuiPy PROPERTIES PREFIX "")
set_target_properties(FreeCADGuiPy PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set_target_properties(FreeCADGuiPy PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
else(MSVC)
set_target_properties(FreeCADGuiPy PROPERTIES OUTPUT_NAME "FreeCADGui")
set_target_properties(FreeCADGuiPy PROPERTIES PREFIX "")
set_target_properties(FreeCADGuiPy PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set_target_properties(FreeCADGuiPy PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
if(WIN32)
@@ -194,4 +199,4 @@ if(FREECAD_BUILD_GUI)
LIBRARY DESTINATION lib
)
endif(WIN32)
endif(FREECAD_BUILD_GUI)
endif(FREECAD_BUILD_GUI)