Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[inih] Upgrade from r51 to r56 #25879

Merged
merged 9 commits into from
Aug 19, 2022
Merged

[inih] Upgrade from r51 to r56 #25879

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dcfc086
[ports/inih/{portfile.cmake,vcpkg.json}] Upgrade from r51 to r56
SamuelMarks Jul 20, 2022
de69082
[ports/inih] Upgrade to latest vcpkg recommendations
SamuelMarks Jul 20, 2022
825f2c2
[ports/inih/CMakeLists.txt] Export targets (following `ports/openctm/…
SamuelMarks Jul 20, 2022
d481e77
Thomas1664's nitpicks agreed on by BillyONeal.
BillyONeal Aug 10, 2022
17c7d52
Fix vcpkg_cmake_config_fixup call and add usage.
BillyONeal Aug 10, 2022
7efc08c
Merge remote-tracking branch 'origin/master' into inih
BillyONeal Aug 10, 2022
96cb416
Hook up with_INIReader
BillyONeal Aug 11, 2022
6298b07
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Aug 19, 2022
d15a421
Version DB oops
BillyONeal Aug 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ports/inih/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
project(inih)
cmake_minimum_required(VERSION 3.14)
project(iniparser LANGUAGES C CXX)

set(SOURCES ini.c cpp/INIReader.cpp)
set(HEADERS ini.h cpp/INIReader.h)

add_library(inih ${SOURCES})
add_library(inih ${HEADERS} ${SOURCES})

install(
TARGETS inih
JonLiu1993 marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
9 changes: 4 additions & 5 deletions ports/inih/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,18 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO benhoyt/inih
REF d7f465792c0c7686b50ed45c9a435394ae418d3e # r51
SHA512 f3b621225933d74e9b130957aab1d55a82f06fd836aace439f9192a393d82a446e9f2152bb617a73a1dc681a821fc31d217c41f38c8ef8eeef7ad64c3e274b5d
REF 5e1d9e2625842dddb3f9c086a50f22e4f45dfc2b # r56
SHA512 477a66643f6636a5826a1206c6588a12827e24a4a2609e11f0695888998e2bfcba8bdb2240c561404ee675bf4c72e85d7d008a1fbddb142c0d263b413de8d358
HEAD_REF master
)

file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
BillyONeal marked this conversation as resolved.
Show resolved Hide resolved

vcpkg_configure_cmake(
vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
)

vcpkg_install_cmake()
vcpkg_cmake_install()
BillyONeal marked this conversation as resolved.
Show resolved Hide resolved

file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/inih RENAME copyright)

Expand Down
17 changes: 14 additions & 3 deletions ports/inih/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
{
"name": "inih",
"version-string": "51",
"port-version": 1,
"description": "Simple .INI file parser"
"version": "56",
"description": "Simple .INI file parser",
"homepage": "https://github.com/benhoyt/inih",
"license": "BSD-3-Clause",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3009,8 +3009,8 @@
"port-version": 1
},
"inih": {
"baseline": "51",
"port-version": 1
"baseline": "56",
"port-version": 0
},
"iniparser": {
"baseline": "2020-04-06",
Expand Down
5 changes: 5 additions & 0 deletions versions/i-/inih.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8c8ad9416cc29d6261d2ff076e96cde766248d33",
"version": "56",
"port-version": 0
},
{
"git-tree": "de1d85a0ea62e95bd096ecff062115646742cf1e",
"version-string": "51",
Expand Down