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

[quill] Update to 4.1.0 #38886

Merged
merged 4 commits into from
May 27, 2024
Merged

[quill] Update to 4.1.0 #38886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9be221b
[quill] Update to 4.0.0
RT2Code May 22, 2024
80d983f
[quill] Update version files
RT2Code May 22, 2024
e2a0a06
[quill] Update to 4.1.0
RT2Code May 25, 2024
f31753a
[quill] Update version files
RT2Code May 25, 2024
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
34 changes: 2 additions & 32 deletions ports/quill/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,11 @@
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO odygrd/quill
REF v${VERSION}
SHA512 ac5d0432fb8bdf074906f5858f1e795f2e4cb9b28a9e2cb5f16c5ddc172bdd6676880a1ab4f0ab073ba5b24fb76a37020c8ff3a58ece462cd8dfd4676122a4ee
SHA512 5bd77416f1cc2218a72d49a51eefd04a08ccd535b798d6754eb5e80931c750d9d07a80b231b5c5f839235867392320792e78fde5d4b8cdb751f3dabc1d41c6e8
HEAD_REF master
)

if(VCPKG_TARGET_IS_ANDROID)
set(ADDITIONAL_OPTIONS -DQUILL_NO_THREAD_NAME_SUPPORT=ON)
endif()

vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
-DQUILL_FMT_EXTERNAL=ON
${ADDITIONAL_OPTIONS}
)

vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/quill)

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/quill/bundled")

if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
file(RENAME "${CURRENT_PACKAGES_DIR}/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
endif()
vcpkg_fixup_pkgconfig()

vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quill/TweakMe.h" "// #define QUILL_FMT_EXTERNAL" "#define QUILL_FMT_EXTERNAL")
if(VCPKG_TARGET_IS_ANDROID)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quill/TweakMe.h" "// #define QUILL_NO_THREAD_NAME_SUPPORT" "#define QUILL_NO_THREAD_NAME_SUPPORT")
endif()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(COPY ${SOURCE_PATH}/quill/include/ DESTINATION "${CURRENT_PACKAGES_DIR}/include")

vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
15 changes: 2 additions & 13 deletions ports/quill/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
{
"name": "quill",
"version": "3.9.0",
"version": "4.1.0",
"description": "C++14 Asynchronous Low Latency Logging Library",
"homepage": "https://github.com/odygrd/quill/",
"license": "MIT",
"dependencies": [
"fmt",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
"license": "MIT"
}
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7521,7 +7521,7 @@
"port-version": 9
},
"quill": {
"baseline": "3.9.0",
"baseline": "4.1.0",
"port-version": 0
},
"quirc": {
Expand Down
5 changes: 5 additions & 0 deletions versions/q-/quill.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "917d334c1a784bef09f68036b78d415761f4dbbb",
"version": "4.1.0",
"port-version": 0
},
{
"git-tree": "37bdd037d3be8510199f4b6cf39287542a65aff2",
"version": "3.9.0",
Expand Down