From b96f10f28fe5fe0f525fce2eaecab91835c9733b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Wed, 5 Jul 2023 14:27:14 -0400
Subject: [PATCH] cmake: install headers in subdir
Change-Id: Ia3685fd5c768c484e1b2d245c76884cf60de1aff
---
CMakeLists.txt | 30 +++++++++++++-----------------
1 file changed, 13 insertions(+), 17 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a568e9..1ce2460 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,17 +38,17 @@ list (APPEND dhtnet_SOURCES
)
list (APPEND dhtnet_HEADERS
- include/connectionmanager.h
- include/multiplexed_socket.h
- include/tls_session.h
- include/certstore.h
- include/ice_options.h
- include/fileutils.h
- include/string_utils.h
- include/ip_utils.h
- include/upnp/mapping.h
- include/upnp/upnp_context.h
- include/upnp/upnp_control.h
+ connectionmanager.h
+ multiplexed_socket.h
+ tls_session.h
+ certstore.h
+ ice_options.h
+ fileutils.h
+ string_utils.h
+ ip_utils.h
+ upnp/mapping.h
+ upnp/upnp_context.h
+ upnp/upnp_control.h
)
add_library(dhtnet ${dhtnet_SOURCES})
@@ -58,16 +58,12 @@ target_include_directories(dhtnet PUBLIC
$<INSTALL_INTERFACE:include>
)
target_compile_definitions(dhtnet PUBLIC PJ_AUTOCONF=1)
-set_target_properties(dhtnet PROPERTIES PUBLIC_HEADER "${dhtnet_HEADERS}")
+set_target_properties(dhtnet PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/include/${dhtnet_HEADERS}")
configure_file(dhtnet.pc.in dhtnet.pc @ONLY)
-install(TARGETS dhtnet
- PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dhtnet
-)
-
# Install targets
-install (DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
+install(TARGETS dhtnet PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dhtnet)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/dhtnet.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
if (BUILD_TESTING AND NOT MSVC)
--
GitLab