From ca51dec92194c4b9009bfa98f859ab4a343faa3f Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 3 Jul 2019 16:18:13 +0200 Subject: [PATCH] do not force CMAKE_INSTALL_LIBDIR to be an absolute path --- CMakeLists.txt | 6 ------ cMake/FreeCadMacros.cmake | 6 ++++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ded1f75a3e..3e9afd5cad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -154,12 +154,6 @@ set(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for documentation and # Don't set it without manual adoption of LibDir variable in src/App/FreeCADInit.py set(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Output directory for libraries") -if (NOT WIN32) - if(NOT IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) - set(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") - endif(NOT IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) -endif(NOT WIN32) - set(PYCXX_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/src" CACHE PATH "Path to the directory containing PyCXX's CXX/Config.hxx include file") diff --git a/cMake/FreeCadMacros.cmake b/cMake/FreeCadMacros.cmake index 660f769265..58ddc668f2 100644 --- a/cMake/FreeCadMacros.cmake +++ b/cMake/FreeCadMacros.cmake @@ -237,8 +237,10 @@ MACRO(SET_BIN_DIR ProjectName OutputName) # FreeCADBase, SMDS, Driver, MEFISTO2 and area-native libs don't depend on parts from CMAKE_INSTALL_LIBDIR if(NOT ${ProjectName} MATCHES "^(FreeCADBase|SMDS|Driver|MEFISTO2|area-native)$") if(${ARGC} STREQUAL 4) - set_property(TARGET ${ProjectName} APPEND PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}${ARGV3}) - else(${ARGC} STREQUAL 4) + set_property(TARGET ${ProjectName} APPEND PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${ARGV3}) + elseif(NOT IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) + set_property(TARGET ${ProjectName} APPEND PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) + else() set_property(TARGET ${ProjectName} APPEND PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_LIBDIR}) endif() endif()