From 6d7fb4b3591588a6141219a2de886850c363c2e8 Mon Sep 17 00:00:00 2001 From: David Minton Date: Mon, 17 Jun 2024 11:36:23 -0400 Subject: [PATCH] Updated CMake build to better control RPATH values when building --- CMakeLists.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b830e93..ffc3394 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,6 +77,7 @@ FILE(TO_CMAKE_PATH ${PY} PY) INCLUDE(GNUInstallDirs) IF (SKBUILD) + SET(INSTALL_INCLUDEDIR ${SKBUILD_HEADERS_DIR}) SET(INSTALL_PYPROJ ${SKBUILD_PLATLIB_DIR}/${SKBUILD_PROJECT_NAME}) SET(INSTALL_BINDIR ${INSTALL_PYPROJ}) IF (CIBUILDWHEEL) @@ -84,9 +85,12 @@ IF (SKBUILD) SET(CMAKE_INSTALL_RPATH "${CMAKE_BINARY_DIR}/bin") ELSE() SET(INSTALL_LIBDIR ${INSTALL_BINDIR}) - SET(CMAKE_INSTALL_RPATH "${INSTALL_LIBDIR}") + IF (APPLE) + SET(CMAKE_INSTALL_RPATH "@loader_path;${INSTALL_LIBDIR}") + ELSEIF (LINUX) + SET(CMAKE_INSTALL_RPATH "@ORIGIN;${INSTALL_LIBDIR}") + ENDIF () ENDIF() - SET(INSTALL_INCLUDEDIR ${SKBUILD_HEADERS_DIR}) ELSE () SET(INSTALL_PYPROJ ${PY}) SET(INSTALL_BINDIR ${CMAKE_INSTALL_BINDIR}) @@ -124,6 +128,8 @@ ENDIF() # Set the name of the ctem library SET(CTEM_LIBRARY ${SKBUILD_PROJECT_NAME}) +SET(CMAKE_POSITION_INDEPENDENT_CODE ON) + # The source for the CTEM binary and have it placed in the bin folder ADD_SUBDIRECTORY(${SRC} ${BIN})