From 5bf7eac4ccee5315cd88bc47106dc0b9bab5b8c6 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Tue, 2 Jan 2018 16:53:08 +0100 Subject: cmake-utils.eclass: switch Darwin to rpath mode, bug #642668 By Michael Weiser, relying on the other support that enables @rpath entries, supported in macOS 10.5 and up. Closes: https://bugs.gentoo.org/642668 --- eclass/cmake-utils.eclass | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'eclass/cmake-utils.eclass') diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 623c353b46c..de58d37addd 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -586,12 +586,10 @@ cmake-utils_src_configure() { ELSE () SET(CMAKE_PREFIX_PATH "${EPREFIX}/usr" CACHE STRING "" FORCE) + SET(CMAKE_MACOSX_RPATH ON CACHE BOOL "" FORCE) SET(CMAKE_SKIP_BUILD_RPATH OFF CACHE BOOL "" FORCE) SET(CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE) - SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE CACHE BOOL "") - SET(CMAKE_INSTALL_RPATH "${EPREFIX}/usr/lib;${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)" CACHE STRING "" FORCE) SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "" FORCE) - SET(CMAKE_INSTALL_NAME_DIR "${EPREFIX}/usr/lib" CACHE STRING "" FORCE) ENDIF (NOT APPLE) _EOF_ -- cgit v1.2.3