* Update log4cplus to 2.0.7

* Update CI baseline

Co-authored-by: chausner <chausner@users.noreply.github.com>
This commit is contained in:
chausner 2021-10-11 19:52:33 +02:00 коммит произвёл GitHub
Родитель 5d191e6cb3
Коммит 10e699ca7e
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 34 добавлений и 23 удалений

Просмотреть файл

@ -1,37 +1,36 @@
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO log4cplus/log4cplus REPO log4cplus/log4cplus
REF 9d00f7d10f2507f68f9ab5fea8b842735d9c6cfe # REL_2_0_5 REF REL_2_0_7
SHA512 b64a1d3a60584b2ba3a58470a0b0ec4c22eb0c054c0ef8ef3808fcba5604860fbd5b2d96148939ea15d3bf2ff1e40e684710dc81b57b73232851a486251f648d SHA512 FE5FCEB346AC19A6D953661A20E8AA02AB48E872F427D958EA99C62F534DDF1FA4511FFD67A662605B1F225E3A6C06B0EE2C1B0EB62DE3AA0316F47F778DF06D
HEAD_REF master HEAD_REF master
) )
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH THREADPOOL_SOURCE_PATH OUT_SOURCE_PATH THREADPOOL_SOURCE_PATH
REPO log4cplus/ThreadPool REPO log4cplus/ThreadPool
REF cc0b6371d3963f7028c2da5fc007733f9f3bf205 REF 3507796e172d36555b47d6191f170823d9f6b12c
SHA512 ad4d287c1f83acac4c127136bc92489c43bb5293613dc54b878b8e75a8583f7eefda6434d09789dad47b87a5d38f10a07a746d42d299410c11f2dbcce8af3012 SHA512 6b46ce287d68fd0cda0c69fda739eaeda89e1ed4f086e28a591f4e50aaf80ee2defc28ee14a5bf65be005c1a6ec4f2848d5723740726c54d5cc1d20f8e98aa0c
HEAD_REF master HEAD_REF master
) )
file( file(
COPY COPY
${THREADPOOL_SOURCE_PATH}/COPYING "${THREADPOOL_SOURCE_PATH}/COPYING"
${THREADPOOL_SOURCE_PATH}/example.cpp "${THREADPOOL_SOURCE_PATH}/example.cpp"
${THREADPOOL_SOURCE_PATH}/README.md "${THREADPOOL_SOURCE_PATH}/README.md"
${THREADPOOL_SOURCE_PATH}/ThreadPool.h "${THREADPOOL_SOURCE_PATH}/ThreadPool.h"
DESTINATION ${SOURCE_PATH}/threadpool DESTINATION "${SOURCE_PATH}/threadpool"
) )
vcpkg_check_features( vcpkg_check_features(
OUT_FEATURE_OPTIONS FEATURE_OPTIONS OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES FEATURES
unicode UNICODE unicode UNICODE
) )
vcpkg_configure_cmake( vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS OPTIONS
-DLOG4CPLUS_BUILD_TESTING=OFF -DLOG4CPLUS_BUILD_TESTING=OFF
-DLOG4CPLUS_BUILD_LOGGINGSERVER=OFF -DLOG4CPLUS_BUILD_LOGGINGSERVER=OFF
@ -40,14 +39,14 @@ vcpkg_configure_cmake(
${FEATURE_OPTIONS} ${FEATURE_OPTIONS}
) )
vcpkg_install_cmake() vcpkg_cmake_install()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/log4cplus) vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/log4cplus)
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright # Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

Просмотреть файл

@ -1,11 +1,18 @@
{ {
"name": "log4cplus", "name": "log4cplus",
"version-string": "2.0.5", "version": "2.0.7",
"port-version": 2,
"description": "A simple to use C++ logging API providing thread--safe, flexible, and arbitrarily granular control over log management and configuration", "description": "A simple to use C++ logging API providing thread--safe, flexible, and arbitrarily granular control over log management and configuration",
"homepage": "https://github.com/log4cplus/log4cplus", "homepage": "https://github.com/log4cplus/log4cplus",
"dependencies": [ "dependencies": [
"catch" "catch",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
], ],
"features": { "features": {
"unicode": { "unicode": {

Просмотреть файл

@ -4045,8 +4045,8 @@
"port-version": 1 "port-version": 1
}, },
"log4cplus": { "log4cplus": {
"baseline": "2.0.5", "baseline": "2.0.7",
"port-version": 2 "port-version": 0
}, },
"log4cpp": { "log4cpp": {
"baseline": "2.9.1", "baseline": "2.9.1",

Просмотреть файл

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "765ee7e801e35c4c77e890bb4af363042e9384ae",
"version": "2.0.7",
"port-version": 0
},
{ {
"git-tree": "0fab754f152f45627bbebb4629e2f508eeccb690", "git-tree": "0fab754f152f45627bbebb4629e2f508eeccb690",
"version-string": "2.0.5", "version-string": "2.0.5",