From 31ac1e4ab263060d3beadffb5bffaab0ce87e8e3 Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Thu, 8 Dec 2022 12:46:40 +0200 Subject: [PATCH] Add path to libvcmi.so into RPATH so dynamic linker can find it --- CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bb862f887..95fe102a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -382,22 +382,24 @@ else() include(GNUInstallDirs) if(ENABLE_MONOLITHIC_INSTALL) - set(CMAKE_INSTALL_RPATH "$ORIGIN/") set(BIN_DIR "." CACHE STRING "Where to install binaries") set(LIB_DIR "." CACHE STRING "Where to install main library") set(DATA_DIR "." CACHE STRING "Where to install data files") + set(CMAKE_INSTALL_RPATH "$ORIGIN/") else() if(NOT BIN_DIR) - set(BIN_DIR "bin" CACHE STRING "Where to install binaries") + set(BIN_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING "Where to install binaries") endif() if(NOT LIB_DIR) set(LIB_DIR "${CMAKE_INSTALL_LIBDIR}/vcmi" CACHE STRING "Where to install main library") endif() if(NOT DATA_DIR) - set(DATA_DIR "share/vcmi" CACHE STRING "Where to install data files") + set(DATA_DIR "${CMAKE_INSTALL_DATAROOTDIR}/vcmi" CACHE STRING "Where to install data files") endif() + set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}") endif() + # following constants only used for platforms using XDG (Linux, BSD, etc) add_definitions(-DM_DATA_DIR="${CMAKE_INSTALL_PREFIX}/${DATA_DIR}") add_definitions(-DM_BIN_DIR="${CMAKE_INSTALL_PREFIX}/${BIN_DIR}")