From ea78404d25e399aad32ef98e3a9f51379a2ec0a8 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 22 Apr 2026 21:52:55 +0200 Subject: [PATCH] [inih] Revise (#51315) --- ports/inih/portfile.cmake | 19 +++++-------------- ports/inih/usage | 22 +++++++++++++++------- ports/inih/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/i-/inih.json | 5 +++++ 5 files changed, 27 insertions(+), 22 deletions(-) diff --git a/ports/inih/portfile.cmake b/ports/inih/portfile.cmake index 1363cdb064..958c950abc 100644 --- a/ports/inih/portfile.cmake +++ b/ports/inih/portfile.cmake @@ -14,31 +14,22 @@ vcpkg_check_features( cpp with_INIReader ) -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - set(INIH_CONFIG_DEBUG ON) -else() - set(INIH_CONFIG_DEBUG OFF) -endif() - -# Install unofficial CMake package -configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-inihConfig.cmake.in" "${CURRENT_PACKAGES_DIR}/share/unofficial-inih/unofficial-inihConfig.cmake" @ONLY) - -# meson build string(REPLACE "OFF" "false" FEATURE_OPTIONS "${FEATURE_OPTIONS}") string(REPLACE "ON" "true" FEATURE_OPTIONS "${FEATURE_OPTIONS}") vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - "${FEATURE_OPTIONS}" + ${FEATURE_OPTIONS} "-Dcpp_std=c++11" ) vcpkg_install_meson() +vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -vcpkg_copy_pdbs() +string(COMPARE EQUAL "${VCPKG_BUILD_TYPE}" "" INIH_CONFIG_DEBUG) +configure_file("${CURRENT_PORT_DIR}/unofficial-inihConfig.cmake.in" "${CURRENT_PACKAGES_DIR}/share/unofficial-inih/unofficial-inihConfig.cmake" @ONLY) +file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") - -configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) diff --git a/ports/inih/usage b/ports/inih/usage index 227be04c6f..85a48c985b 100644 --- a/ports/inih/usage +++ b/ports/inih/usage @@ -1,7 +1,15 @@ -The package inih provides unofficial CMake targets: - find_package(unofficial-inih CONFIG REQUIRED) - # C API - target_link_libraries(main PRIVATE unofficial::inih::libinih) - # C++ API (Requires "cpp" feature) - target_link_libraries(main PRIVATE unofficial::inih::inireader) -Alternatively, if you are using pckgconfig use the name "inih" for the C API and "inireader" for the C++ API +inih provides unofficial CMake targets: + + find_package(unofficial-inih CONFIG REQUIRED) + # C API + target_link_libraries(main PRIVATE unofficial::inih::libinih) + # C++ API (Requires "cpp" feature) + target_link_libraries(main PRIVATE unofficial::inih::inireader) + +inih provides pkg-config modules: + + # simple .INI file parser + inih + + # simple .INI file parser for C++ + INIReader diff --git a/ports/inih/vcpkg.json b/ports/inih/vcpkg.json index 435aa36043..8946c6babe 100644 --- a/ports/inih/vcpkg.json +++ b/ports/inih/vcpkg.json @@ -1,6 +1,7 @@ { "name": "inih", "version": "62", + "port-version": 1, "description": "Simple .INI file parser", "homepage": "https://github.com/benhoyt/inih", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 50d2c593b8..3c8d102564 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4006,7 +4006,7 @@ }, "inih": { "baseline": "62", - "port-version": 0 + "port-version": 1 }, "iniparser": { "baseline": "4.2.6", diff --git a/versions/i-/inih.json b/versions/i-/inih.json index 963c92cef6..7a4b4ead0e 100644 --- a/versions/i-/inih.json +++ b/versions/i-/inih.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a9a9c5c156b62b19abbcb8da7a3c84542c9c087", + "version": "62", + "port-version": 1 + }, { "git-tree": "aae946facee360e092d65aff532ba3754da49552", "version": "62",