From 1f78f0170799034c7852385439ef03de4e6c1001 Mon Sep 17 00:00:00 2001 From: fqidz Date: Thu, 29 Aug 2024 18:43:59 +0300 Subject: [PATCH] Replace CMake LIBDIR paths to use FULL_LIBDIR --- CMakeLists.txt | 2 +- sfcgal-config.in | 2 +- sfcgal.pc.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 07a6c2e5..8e42025c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -221,7 +221,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR) set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "object code libraries (${_LIBDIR_DEFAULT})") endif() -SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") +SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}") SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) #SET(CMAKE_MACOSX_RPATH ON) diff --git a/sfcgal-config.in b/sfcgal-config.in index a0e992c5..49615c13 100755 --- a/sfcgal-config.in +++ b/sfcgal-config.in @@ -1,6 +1,6 @@ #!/bin/sh prefix=@CMAKE_INSTALL_PREFIX@ -libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ usage() { diff --git a/sfcgal.pc.in b/sfcgal.pc.in index 968cb407..bf517d02 100644 --- a/sfcgal.pc.in +++ b/sfcgal.pc.in @@ -1,6 +1,6 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ includedir=${prefix}/include Name: sfcgal