From 8e34b40170d89931b02df4c00859daa43ce4d92f Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Tue, 6 Apr 2021 21:49:53 +0200 Subject: CMake: Support absolute paths for CMAKE_INSTALL_(LIB|INCLUDE)DIR --- CMakeLists.txt | 12 ++++++++++++ ChangeLog | 3 +++ THANKS | 1 + liburiparser.pc.in | 4 ++-- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fce0cf9..95660a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -430,6 +430,18 @@ uriparser_install( # pkg-config file # if(NOT MSVC) + if(CMAKE_INSTALL_LIBDIR MATCHES "^/") + set(_URIPARSER_PKGCONFIG_LIBDIR "${CMAKE_INSTALL_LIBDIR}") + else() + set(_URIPARSER_PKGCONFIG_LIBDIR "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") + endif() + + if(CMAKE_INSTALL_INCLUDEDIR MATCHES "^/") + set(_URIPARSER_PKGCONFIG_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}") + else() + set(_URIPARSER_PKGCONFIG_INCLUDEDIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") + endif() + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/liburiparser.pc.in liburiparser.pc @ONLY) uriparser_install( FILES diff --git a/ChangeLog b/ChangeLog index 3e7a898..eb9b8b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,9 @@ XXXX-XX-XX -- X.X.X * Fixed: CMake: Call "enable_language(CXX)" prior to tinkering with CMAKE_CXX_* variables (GitHub #110) Thanks to Alexander Richardson for the patch (originally at libexpat) + * Fixed: CMake: Support absolute paths for both CMAKE_INSTALL_LIBDIR + and CMAKE_INSTALL_INCLUDEDIR (GitHub #114) + Thanks to Rafael Fontenelle for bringing this up (originally at libexpat) * Fixed: Windows: Address MSVC compiler warnings (GitHub #111) * Fixed: Addressed MSVC compiler warnings in test suite code (GitHub #113) diff --git a/THANKS b/THANKS index 7b16a1c..c696f93 100644 --- a/THANKS +++ b/THANKS @@ -45,6 +45,7 @@ myd7349 Periklis Akritidis Philip de Nier Radu Hociung +Rafael Fontenelle Ralf S. Engelschall Rakesh Pandit René Rebe diff --git a/liburiparser.pc.in b/liburiparser.pc.in index 9547860..cb78000 100644 --- a/liburiparser.pc.in +++ b/liburiparser.pc.in @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ -includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +libdir=@_URIPARSER_PKGCONFIG_LIBDIR@ +includedir=@_URIPARSER_PKGCONFIG_INCLUDEDIR@ Name: liburiparser Description: URI parsing and handling library -- cgit v1.2.1