From deeb1930ded37da3eb13b762cf1493f6366e6f91 Mon Sep 17 00:00:00 2001 From: Christoph Willing Date: Thu, 20 Aug 2026 09:38:05 +1000 Subject: [PATCH] Generalise installation lib directory Signed-off-by: Christoph Willing --- CMakeLists.txt | 2 ++ lib/CMakeLists.txt | 6 +++--- lib/logilinux.pc.in | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a7d003..35f7d0b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,8 @@ project(logilinux VERSION 0.1.0) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) +include(GNUInstallDirs) + find_package(Threads REQUIRED) add_subdirectory(lib) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 8a9abc5..f106c80 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -59,8 +59,8 @@ set_target_properties(logilinux PROPERTIES # Installation rules install(TARGETS logilinux - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION bin ) @@ -78,5 +78,5 @@ configure_file( ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/logilinux.pc - DESTINATION lib/pkgconfig + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) diff --git a/lib/logilinux.pc.in b/lib/logilinux.pc.in index 0b99476..345c901 100644 --- a/lib/logilinux.pc.in +++ b/lib/logilinux.pc.in @@ -1,6 +1,6 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=${exec_prefix}/lib +libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ includedir=${prefix}/include Name: LogiLinux