diff --git a/ports/influxdb-cxx/268.patch b/ports/influxdb-cxx/268.patch new file mode 100644 index 0000000000..cbf004dd8a --- /dev/null +++ b/ports/influxdb-cxx/268.patch @@ -0,0 +1,39 @@ +From 2588071852747d48e27c1ab8f478c3e24209b23f Mon Sep 17 00:00:00 2001 +From: offa +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 +- $ ++ $ + $ + # for export header + $ diff --git a/ports/influxdb-cxx/portfile.cmake b/ports/influxdb-cxx/portfile.cmake index e959d6baa3..740f4aa884 100644 --- a/ports/influxdb-cxx/portfile.cmake +++ b/ports/influxdb-cxx/portfile.cmake @@ -2,9 +2,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO offa/influxdb-cxx REF "v${VERSION}" - SHA512 ac16178a17ac9b43a23d64f56d0012aeda896d3065246166abdef1441cf466453a6972c5820411936dcfa10a21505b654dfe981449c1d4cc169807f1db5d099f + SHA512 ac16178a17ac9b43a23d64f56d0012aeda896d3065246166abdef1441cf466453a6972c5820411936dcfa10a21505b654dfe981449c1d4cc169807f1db5d099f HEAD_REF master - PATCHES fix-dllexports.patch + PATCHES + fix-dllexports.patch + 268.patch # https://github.com/offa/influxdb-cxx/pull/268 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/influxdb-cxx/vcpkg.json b/ports/influxdb-cxx/vcpkg.json index a8dec2132e..79dd2118ee 100644 --- a/ports/influxdb-cxx/vcpkg.json +++ b/ports/influxdb-cxx/vcpkg.json @@ -1,6 +1,7 @@ { "name": "influxdb-cxx", "version": "0.7.2", + "port-version": 1, "description": "InfluxDB C++ client library", "homepage": "https://github.com/offa/influxdb-cxx", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index ae26305f45..9675584b87 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3714,7 +3714,7 @@ }, "influxdb-cxx": { "baseline": "0.7.2", - "port-version": 0 + "port-version": 1 }, "infoware": { "baseline": "2023-04-12", diff --git a/versions/i-/influxdb-cxx.json b/versions/i-/influxdb-cxx.json index 4166e24279..3d92a2b565 100644 --- a/versions/i-/influxdb-cxx.json +++ b/versions/i-/influxdb-cxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1352a7a7701709dddd91bca356b81ecaf9450501", + "version": "0.7.2", + "port-version": 1 + }, { "git-tree": "1fd656270f4061beeca3b7aee1346ae242c041c0", "version": "0.7.2",