From 7e0f8b111ac26a2c5ac3c4a25787a9f02c65fe9d Mon Sep 17 00:00:00 2001 From: Xavier Del Campo Romero Date: Fri, 17 Jan 2025 06:29:10 +0100 Subject: [PATCH] cmake: Set CMAKE_INSTALL_RPATH from top-level CMakeLists.txt There is no need to assign this variable every time macros.cmake is included. --- CMakeLists.txt | 5 +++++ cmake/macros.cmake | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 002b2272a..2540bbf76 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,6 +75,11 @@ endif() INCLUDE(cmake/macros.cmake) INCLUDE(cmake/checks.cmake) +set(CMAKE_INSTALL_RPATH + ${CMAKE_INSTALL_RPATH} + ${CMAKE_INSTALL_PREFIX}/${SD_LIBDIR}/lib +) + CHECK_HEADERS_H() CHECK_FUNCTIONS() CHECK_LIBRARIES() diff --git a/cmake/macros.cmake b/cmake/macros.cmake index 44de00bfb..feaf53a7b 100644 --- a/cmake/macros.cmake +++ b/cmake/macros.cmake @@ -82,7 +82,6 @@ STRING(REGEX REPLACE "^(.*[^/])/*$" "\\1" SD_LOCALDIR_TMP ${SD_LOCALDIR}) SET(SD_LOCALDIR ${SD_LOCALDIR_TMP}) SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}) -SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${SD_LIBDIR}/lib) # Configuration options macros. INCLUDE(${CMAKE_CURRENT_LIST_DIR}/options.cmake)