From 79ae0091ad503622fca0f114c3acf4350a311746 Mon Sep 17 00:00:00 2001 From: Johannes Obermayr Date: Tue, 28 Jul 2015 21:16:25 +0200 Subject: [PATCH] libarea doesn't depend on parts from CMAKE_INSTALL_LIBDIR Fixes: -- Installing: /home/abuild/rpmbuild/BUILDROOT/FreeCAD-0.15.99+git20150727.1925-1.1.x86_64/usr/lib64/FreeCAD/lib/area.so CMake Error at src/Mod/Path/libarea/cmake_install.cmake:53 (file): file RPATH_CHANGE could not write new RPATH: /usr/lib64/FreeCAD/lib to the file: /home/abuild/rpmbuild/BUILDROOT/FreeCAD-0.15.99+git20150727.1925-1.1.x86_64/usr/lib64/FreeCAD/lib/area.so No valid ELF RPATH or RUNPATH entry exists in the file; --- cMake/FreeCadMacros.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cMake/FreeCadMacros.cmake b/cMake/FreeCadMacros.cmake index 6e3240979196..ba82aceb0425 100644 --- a/cMake/FreeCadMacros.cmake +++ b/cMake/FreeCadMacros.cmake @@ -236,8 +236,8 @@ MACRO(SET_BIN_DIR ProjectName OutputName) if(WIN32) set_target_properties(${ProjectName} PROPERTIES DEBUG_OUTPUT_NAME ${OutputName}_d) else(WIN32) - # FreeCADBase, SMDS, Driver and MEFISTO2 libs don't depend on parts from CMAKE_INSTALL_LIBDIR - if(NOT ${ProjectName} MATCHES "^(FreeCADBase|SMDS|Driver|MEFISTO2)$") + # 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}) else(${ARGC} STREQUAL 4)