mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 07:19:00 +08:00
40 lines
1.6 KiB
Diff
40 lines
1.6 KiB
Diff
From 2588071852747d48e27c1ab8f478c3e24209b23f Mon Sep 17 00:00:00 2001
|
|
From: offa <bm-dev@yandex.com>
|
|
Date: Mon, 14 Oct 2024 18:11:39 +0200
|
|
Subject: [PATCH] Install public API Header to InfluxDB/ subdirectory
|
|
|
|
Adaption of #264
|
|
---
|
|
CMakeLists.txt | 4 ++--
|
|
src/CMakeLists.txt | 2 +-
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 310aa12c5dbe54db2b2587290a1e4ff65ad8d716..6acb4e6c74891569b71ee84245cd54b55d7897e8 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -149,8 +149,8 @@ write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/cmake/InfluxDBConf
|
|
)
|
|
|
|
# Install headers
|
|
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
|
|
-install(FILES ${PROJECT_BINARY_DIR}/src/influxdb_export.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
|
|
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/InfluxDB")
|
|
+install(FILES ${PROJECT_BINARY_DIR}/src/influxdb_export.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/InfluxDB")
|
|
|
|
# Export targets
|
|
install(EXPORT InfluxDBTargets
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
index 3c58bd299b47e647afa42c1594a129a4eee7c5d8..d68b69eeb3f28199993d90e147a4d562fb766472 100644
|
|
--- a/src/CMakeLists.txt
|
|
+++ b/src/CMakeLists.txt
|
|
@@ -71,7 +71,7 @@ generate_export_header(InfluxDB)
|
|
|
|
target_include_directories(InfluxDB
|
|
PUBLIC
|
|
- $<INSTALL_INTERFACE:include>
|
|
+ $<INSTALL_INTERFACE:include/InfluxDB>
|
|
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
|
|
# for export header
|
|
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/src>
|