diff options
| author | Markus Hovorka | 2017-05-19 11:56:39 +0200 |
|---|---|---|
| committer | Markus Hovorka | 2017-05-19 11:56:39 +0200 |
| commit | dc465119e64f948ae0a669913984325aad7fb59d (patch) | |
| tree | 033c3157bf4ed5b74ebcd078a506023f51037bf9 /rpath.patch | |
| parent | d7214cca4037b5f0d790c711f703d556f3463842 (diff) | |
| parent | 69549d556f021e9f6313f6882e133f3ac7e47886 (diff) | |
| download | aur-dc465119e64f948ae0a669913984325aad7fb59d.tar.gz | |
Merge branch 'master' of ssh://aur.archlinux.org/freecad-git
Diffstat (limited to 'rpath.patch')
| -rw-r--r-- | rpath.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/rpath.patch b/rpath.patch new file mode 100644 index 000000000000..ceeaebd2dd11 --- /dev/null +++ b/rpath.patch @@ -0,0 +1,16 @@ +diff --git a/cMake/FreeCadMacros.cmake b/cMake/FreeCadMacros.cmake +index 1faa610d8..18ccdeea6 100644 +--- a/cMake/FreeCadMacros.cmake ++++ b/cMake/FreeCadMacros.cmake +@@ -239,9 +239,9 @@ MACRO(SET_BIN_DIR ProjectName OutputName) + # FreeCADBase, SMDS, Driver, MEFISTO2 and area libs don't depend on parts from CMAKE_INSTALL_LIBDIR + if(NOT ${ProjectName} MATCHES "^(FreeCADBase|SMDS|Driver|MEFISTO2|area)$") + if(${ARGC} STREQUAL 4) +- set_target_properties(${ProjectName} PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}${ARGV3}) ++ set_property(TARGET ${ProjectName} APPEND PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}${ARGV3}) + else(${ARGC} STREQUAL 4) +- set_target_properties(${ProjectName} PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_LIBDIR}) ++ set_property(TARGET ${ProjectName} APPEND PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_LIBDIR}) + endif() + endif() + endif(WIN32) |