diff options
| author | Azat Khuzhin <azat@libevent.org> | 2022-07-10 13:48:53 +0300 |
|---|---|---|
| committer | Azat Khuzhin <azat@libevent.org> | 2023-05-14 22:43:47 +0200 |
| commit | 41a7393f3ecd1e9f58331df4653dac2e6739304e (patch) | |
| tree | 749085ef7dd9fb0cd9f1c102408c68146662ddb7 | |
| parent | be03bf385b0dccec189af71af71e0af0b402ebdb (diff) | |
| download | libevent-41a7393f3ecd1e9f58331df4653dac2e6739304e.tar.gz | |
Fix Configure_RPATH()
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c88ba56..ab53b8b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -172,20 +172,21 @@ if (NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) endif() +include(GNUInstallDirs) + # The RPATH to be used when installing, but only if it's not a system directory # # Refs: https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling macro(Configure_RPATH) - # NOTE: that CMAKE_INSTALL_PREFIX not always normalized correctly, i.e.: + # NOTE: that CMAKE_INSTALL_LIBDIR not always normalized correctly, i.e.: # - "///" -> "/" # - "/////usr///" -> "//usr" # So it should be normalized again. - - get_filename_component(CMAKE_INSTALL_PREFIX_NORMALIZED "${CMAKE_INSTALL_PREFIX}" REALPATH) - list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX_NORMALIZED}/lib" isSystemDir) + get_filename_component(CMAKE_INSTALL_LIBDIR_NORMALIZED "${CMAKE_INSTALL_PREFIX}" REALPATH) + list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_LIBDIR_NORMALIZED}/lib" isSystemDir) if("${isSystemDir}" STREQUAL "-1") - set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX_NORMALIZED}/lib") + set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR_NORMALIZED}") endif() endmacro() Configure_RPATH() @@ -1621,8 +1622,6 @@ endif() # Installation preparation. # -include(GNUInstallDirs) - set(EVENT_INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/libevent") |