[libxdf] Bump to 0.99.9 (#42891)

This commit is contained in:
Weihang Ding 2024-12-24 01:37:34 +08:00 committed by GitHub
parent fea9f01566
commit 558bc16e48
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 8 additions and 70 deletions

View File

@ -1,65 +0,0 @@
From ca070dfdd96db5c9eb9a5a88d1193f25b13e01f3 Mon Sep 17 00:00:00 2001
From: myd7349 <myd7349@gmail.com>
Date: Mon, 31 Jul 2023 23:50:40 +0800
Subject: [PATCH] Fix missing pugixml dependency in generated CMake package
file
---
CMakeLists.txt | 14 ++++++++++++--
libxdfConfig.cmake.in | 9 +++++++++
2 files changed, 21 insertions(+), 2 deletions(-)
create mode 100644 libxdfConfig.cmake.in
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98cc03f..42f9a91 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,18 +43,28 @@ target_include_directories(xdf PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
$<INSTALL_INTERFACE:include>
)
+include(CMakePackageConfigHelpers)
include(GNUInstallDirs)
+configure_package_config_file(
+ ${CMAKE_CURRENT_LIST_DIR}/libxdfConfig.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/libxdfConfig.cmake
+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+)
install(TARGETS xdf
- EXPORT "${PROJECT_NAME}Config"
+ EXPORT "${PROJECT_NAME}Targets"
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)
-install(EXPORT "${PROJECT_NAME}Config"
+install(EXPORT "${PROJECT_NAME}Targets"
COMPONENT ${PROJECT_NAME}
NAMESPACE "XDF::"
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxdfConfig.cmake
+ COMPONENT ${PROJECT_NAME}
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+)
# set(CPACK_STRIP_FILES ON)
# set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
diff --git a/libxdfConfig.cmake.in b/libxdfConfig.cmake.in
new file mode 100644
index 0000000..84331f0
--- /dev/null
+++ b/libxdfConfig.cmake.in
@@ -0,0 +1,9 @@
+@PACKAGE_INIT@
+
+include(CMakeFindDependencyMacro)
+
+find_dependency(pugixml)
+
+if(NOT TARGET XDF::xdf)
+ include("${CMAKE_CURRENT_LIST_DIR}/libxdfTargets.cmake")
+endif()
--
2.30.1.windows.1

View File

@ -4,10 +4,8 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO xdf-modules/libxdf
REF "v${VERSION}"
SHA512 81ff3598442d3ea166ec54b74248ad7b7eca5fcfdb72526978966398ad9e6524883183e71b68e349c46c2705779bf2b4922ce097f01afe7a62faa449ab8fa075
SHA512 17b68a307118a1a1375ad1a4717d5bd83515daea51623f617d0c5673435fb79df2bbc7445504b274495481b089f93b10bec025a05ef641478eff77e36d420e4c
HEAD_REF main
PATCHES
fix-pugixml-dependency.patch
)
vcpkg_cmake_configure(

View File

@ -1,6 +1,6 @@
{
"name": "libxdf",
"version": "0.99.8",
"version": "0.99.9",
"description": "C++ library for loading multimodal, multi-rate signals stored in XDF files.",
"homepage": "https://xdf-modules.github.io/libxdf/",
"license": "BSD-2-Clause",

View File

@ -5393,7 +5393,7 @@
"port-version": 0
},
"libxdf": {
"baseline": "0.99.8",
"baseline": "0.99.9",
"port-version": 0
},
"libxdiff": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ecd47f3dfc1bb7dc0b85374b6e5634c5b47be4a2",
"version": "0.99.9",
"port-version": 0
},
{
"git-tree": "c1a0ecbb62eb5c0d6411498644c94fe08120f3b5",
"version": "0.99.8",