[libconfig] update to 1.8 (#45306)

This commit is contained in:
toge 2025-05-02 01:18:48 +09:00 committed by GitHub
parent 4e5a286317
commit c0d1548b1e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 28 additions and 33 deletions

View File

@ -0,0 +1,12 @@
diff --git a/lib/util.h b/lib/util.h
index f33e70b..7b1e679 100644
--- a/lib/util.h
+++ b/lib/util.h
@@ -22,6 +22,7 @@
#include <string.h>
#include <sys/types.h>
+#include <stdint.h>
extern void libconfig_set_fatal_error_func(void (*func)(const char *));

View File

@ -1,22 +0,0 @@
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 3a64deb..233c89f 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -112,7 +112,7 @@ install(TARGETS ${libname}
)
install(TARGETS ${libname}++
- EXPORT libconfig++Targets
+ EXPORT libconfigTargets
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
@@ -121,7 +121,7 @@ install(TARGETS ${libname}++
include(CMakePackageConfigHelpers)
-foreach(target_name libconfig libconfig++)
+foreach(target_name libconfig)
write_basic_package_version_file("${target_name}ConfigVersion.cmake"
VERSION ${PACKAGE_VERSION}
COMPATIBILITY SameMajorVersion

View File

@ -2,11 +2,11 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO hyperrealm/libconfig
REF "v${VERSION}"
SHA512 3749bf9eb29bab0f6b14f4fc759f0c419ed27a843842aaabed1ec1fbe0faa8c93322ff875ca1291d69cb28a39ece86d512aec42c2140d566c38c56dc616734f4
SHA512 7899d3898e1741d90cf2381561b172ec6ba2bcc47d1b3e6058bcef74d73634d9be33eb8f99a58c7af15ac99e56800510edf3c412d9c1f136e6a3ab744455b992
HEAD_REF master
PATCHES
libconfig++-cmake-export.diff
static-build.diff
include-stdint.patch
)
vcpkg_cmake_configure(
@ -18,6 +18,7 @@ vcpkg_cmake_configure(
vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libconfig)
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

View File

@ -1,5 +1,5 @@
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 233c89f..8164b41 100644
index 00bff60..2935ddf 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -25,7 +25,6 @@ set(libinc_cpp
@ -10,8 +10,8 @@ index 233c89f..8164b41 100644
libconfigcpp.cc)
if(MSVC)
@@ -55,8 +54,10 @@ set_target_properties(${libname}++
#check_symbol_exists(freelocale "locale.h" HAVE_FREELOCALE)
@@ -59,8 +58,10 @@ set_target_properties(${libname}++
PUBLIC_HEADER "${libinc_cpp}")
if(BUILD_SHARED_LIBS)
+ target_sources(${libname}++ PRIVATE ${libsrc})
@ -19,9 +19,9 @@ index 233c89f..8164b41 100644
else()
+ target_link_libraries(${libname}++ PRIVATE ${libname})
target_compile_definitions(${libname} PUBLIC LIBCONFIG_STATIC)
target_compile_definitions(${libname}++ PUBLIC LIBCONFIGXX_STATIC)
target_compile_definitions(${libname}++ PUBLIC LIBCONFIG_STATIC LIBCONFIGXX_STATIC)
endif()
@@ -91,8 +92,8 @@ if(MSVC)
@@ -111,8 +112,8 @@ if(MSVC)
endif()
if(WIN32)

View File

@ -1,7 +1,6 @@
{
"name": "libconfig",
"version": "1.7.3",
"port-version": 5,
"version": "1.8",
"description": "C/C++ library for processing configuration files",
"homepage": "https://github.com/hyperrealm/libconfig",
"dependencies": [

View File

@ -4485,8 +4485,8 @@
"port-version": 0
},
"libconfig": {
"baseline": "1.7.3",
"port-version": 5
"baseline": "1.8",
"port-version": 0
},
"libconfuse": {
"baseline": "3.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "666fdb348e7f60c663c6aeec79d6184eaeaaf8cc",
"version": "1.8",
"port-version": 0
},
{
"git-tree": "bb011bd374885434cf90d445526e42aca185c1e7",
"version": "1.7.3",