[g3log] Update g3log to 2.1 (#28074)

* Update g3log to 2.1

* Update g3log version manifest

* Add license as specified by the github actions bot

* Reupdate the version info again

* [g3log] Address reviews

* Update g3log version manifest
This commit is contained in:
Christian Rendina 2022-12-01 22:43:37 +01:00 committed by GitHub
parent b2a7fdcbb2
commit 6522561467
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 15 deletions

View File

@ -1,20 +1,17 @@
vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KjellKod/g3log
REF 2fca06ff6da5c67465b591f4d45e8fd14d531142 #v1.3.4
SHA512 8dba89e5a08e44d585478470725e25e37486685d8fe4d3cb5e97c81013389c95d96bdde658244e425008169bc8a9fc2d34a065b83b110c62e73d3ccab9b2b9e1
REF 6f6da0ed2a8b42b8a5d1a416fe1646fe45e45c99
SHA512 65d966e0cb35ae6903619349520f12abf473c98ce6c9ffcb9b196b0be5d2b75ee5b716eeec8285ddc909f65049d8feab9389347c28be376b46cdb0d9246ffbbd
HEAD_REF master
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" G3_SHARED_LIB)
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" G3_SHARED_RUNTIME)
# https://github.com/KjellKod/g3log#prerequisites
set(VERSION "1.3.4")
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DG3_SHARED_LIB=${G3_SHARED_LIB} # Options.cmake
-DG3_SHARED_RUNTIME=${G3_SHARED_RUNTIME} # Options.cmake
@ -24,11 +21,11 @@ vcpkg_configure_cmake(
-DVERSION=${VERSION}
)
vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/g3log)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/g3log)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

View File

@ -1,8 +1,18 @@
{
"name": "g3log",
"version": "1.3.4",
"port-version": 2,
"version": "2.1",
"description": "Asynchronous logger with Dynamic Sinks",
"homepage": "https://github.com/KjellKod/g3log",
"supports": "!(arm | uwp)"
"license": "Unlicense",
"supports": "!uwp",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

View File

@ -2509,8 +2509,8 @@
"port-version": 2
},
"g3log": {
"baseline": "1.3.4",
"port-version": 2
"baseline": "2.1",
"port-version": 0
},
"gainput": {
"baseline": "1.0.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ce2eee87993ff26684fad107624adebc23e64737",
"version": "2.1",
"port-version": 0
},
{
"git-tree": "b97c6fdba216caec4a83323a693a871cb57968fd",
"version": "1.3.4",