From f7c5e92203d3a4e84f4d34bea64219511c726f47 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Mon, 6 Jan 2025 19:13:23 +0100
Subject: [PATCH] More use of CMAKE_INSTALL_<...>DIR

CMAKE_INSTALL_INCLUDEDIR is already used for the exported build
interface. This change applies the standard variables to more
destinations, moves the related GNUInstallDirs include to the
top-level CMakeLists.txt, and adds explicit RUNTIME/LIBRARY/ARCHIVE
destinations. This should be beneficial for external packaging.

Last not least put msquic.lttng into the msquic CMake export set.
---
 CMakeLists.txt               |  2 ++
 src/bin/CMakeLists.txt       | 15 ++++++++++-----
 src/generated/CMakeLists.txt |  7 ++++++-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a32b057c25..52a3237fff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -772,6 +772,8 @@ if(QUIC_CODE_CHECK)
     endif()
 endif()
 
+include(GNUInstallDirs)
+
 add_subdirectory(src/inc)
 add_subdirectory(src/generated)
 
diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt
index e69cf51ac5..535593502b 100644
--- a/src/bin/CMakeLists.txt
+++ b/src/bin/CMakeLists.txt
@@ -251,8 +251,6 @@ elseif (CX_PLATFORM STREQUAL "darwin")
         PROPERTIES LINK_FLAGS "-exported_symbols_list \"${CMAKE_CURRENT_SOURCE_DIR}/darwin/exports.txt\"")
 endif()
 
-include(GNUInstallDirs)
-
 file(GLOB PUBLIC_HEADERS "../inc/*.h" "../inc/*.hpp")
 
 if(QUIC_TLS STREQUAL "openssl" OR  QUIC_TLS STREQUAL "openssl3")
@@ -264,11 +262,18 @@ if(WIN32)
 endif()
 
 if(BUILD_SHARED_LIBS)
-  install(TARGETS msquic msquic_platform inc logging_inc warnings main_binary_link_args ${OTHER_TARGETS} EXPORT msquic DESTINATION lib)
+    install(TARGETS msquic msquic_platform inc logging_inc warnings main_binary_link_args ${OTHER_TARGETS}
+        EXPORT msquic
+        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+        LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+        ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+    )
 else()
-  install(FILES ${QUIC_STATIC_LIBRARY} DESTINATION lib)
+    install(FILES "${QUIC_STATIC_LIBRARY}"
+        DESTINATION lib
+    )
 endif()
-install(FILES ${PUBLIC_HEADERS} DESTINATION include)
+install(FILES ${PUBLIC_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
 
 configure_file(msquic-config.cmake.in ${CMAKE_BINARY_DIR}/msquic-config.cmake @ONLY)
 
diff --git a/src/generated/CMakeLists.txt b/src/generated/CMakeLists.txt
index 93bd6cc9a2..86d1fb0a3d 100644
--- a/src/generated/CMakeLists.txt
+++ b/src/generated/CMakeLists.txt
@@ -43,7 +43,12 @@ if(QUIC_ENABLE_LOGGING)
         target_link_libraries(msquic.lttng PRIVATE ${LTTNGUST_LIBRARIES})
         set_target_properties(msquic.lttng PROPERTIES SOVERSION ${QUIC_FULL_VERSION} VERSION ${QUIC_FULL_VERSION})
 
-        install(TARGETS msquic.lttng DESTINATION lib)
+        install(TARGETS msquic.lttng
+            EXPORT msquic
+            RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+            LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+            ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+        )
     endif()
 
 else()