diff options
| author | Sebastian Pipping <sebastian@pipping.org> | 2021-04-06 21:49:53 +0200 |
|---|---|---|
| committer | Sebastian Pipping <sebastian@pipping.org> | 2021-04-06 21:49:53 +0200 |
| commit | 8e34b40170d89931b02df4c00859daa43ce4d92f (patch) | |
| tree | 9e84d1e2e9942469ef89a57731419f36c3a844f2 | |
| parent | f5682fb6dd688e6469befb7319d30e17afa6420f (diff) | |
| download | uriparser-issue-114-cmake-absolute-libdir.tar.gz | |
CMake: Support absolute paths for CMAKE_INSTALL_(LIB|INCLUDE)DIRissue-114-cmake-absolute-libdir
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | 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 @@ -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) @@ -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 |