-
Notifications
You must be signed in to change notification settings - Fork 7.6k
[logme] New port #49397
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.
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
Merged
Merged
[logme] New port #49397
Changes from 6 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
7340e9f
Add logme port
emishkurov ed4d36e
logme: skip gtest discovery when cross-compiling
emishkurov fbea62e
logme: fix cross gtest discovery and bump port-version
emishkurov 15262bf
logme: update to 2.4.1 + disable tests
emishkurov 152ca67
logme: disable examples/tools on UWP
emishkurov bf9008a
logme: update to 2.4.3
emishkurov 8583d29
Delete usage and fix version database.
BillyONeal 65ffd5d
Merge pull request #1 from BillyONeal/pr-49397-logme
efmsoft 28d636d
changelog: add 2.4.4 build fix entry
emishkurov f071859
logme: update to 2.4.4
emishkurov 4df7b9a
ci: retrigger
emishkurov ebe79f6
Fix version database again.
BillyONeal f4254e6
logme: drop examples feature and install logmectl via vcpkg_copy_tools
emishkurov 468f5af
Merge branch 'add-logme' of https://github.com/efmsoft/vcpkg into add…
emishkurov 570f2e9
logme: drop tools feature to avoid vcpkg_copy_tools issues
emishkurov 8b31e63
logme: bump port-version
emishkurov a3c8305
Update ports/logme/portfile.cmake
efmsoft 7349a43
Update ports/logme/vcpkg.json
efmsoft ba7bf40
Update versions/baseline.json
efmsoft a3c42b4
logme: regenerate versions database for 2.4.4
emishkurov b534e0e
vcpkg-cmake vcpkg-cmake-config host dependencies
vicroms File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,58 @@ | ||||||||||||
| vcpkg_from_github( | ||||||||||||
| OUT_SOURCE_PATH SOURCE_PATH | ||||||||||||
| REPO efmsoft/logme | ||||||||||||
| REF v2.4.3 | ||||||||||||
| SHA512 343da7575848519861fa9f7c3987495d58fdd0d7fa2b22f77121230647bf233e98b743a6194a386c23479d940e4a88050d34447c77a730c8dcbacdf6f2b1727f | ||||||||||||
| HEAD_REF master | ||||||||||||
| ) | ||||||||||||
|
|
||||||||||||
| vcpkg_check_features( | ||||||||||||
| OUT_FEATURE_OPTIONS FEATURE_OPTIONS | ||||||||||||
| FEATURES | ||||||||||||
| examples LOGME_BUILD_EXAMPLES | ||||||||||||
| tools LOGME_BUILD_TOOLS | ||||||||||||
| ) | ||||||||||||
|
|
||||||||||||
| if(VCPKG_TARGET_IS_UWP) | ||||||||||||
| list(APPEND FEATURE_OPTIONS | ||||||||||||
| -DLOGME_BUILD_EXAMPLES=OFF | ||||||||||||
| -DLOGME_BUILD_TOOLS=OFF | ||||||||||||
| ) | ||||||||||||
| endif() | ||||||||||||
|
|
||||||||||||
| if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") | ||||||||||||
| set(_logme_static_opt ON) | ||||||||||||
| set(_logme_dynamic_opt OFF) | ||||||||||||
| else() | ||||||||||||
| set(_logme_static_opt OFF) | ||||||||||||
| set(_logme_dynamic_opt ON) | ||||||||||||
| endif() | ||||||||||||
|
efmsoft marked this conversation as resolved.
Outdated
|
||||||||||||
|
|
||||||||||||
| vcpkg_cmake_configure( | ||||||||||||
| SOURCE_PATH "${SOURCE_PATH}" | ||||||||||||
| OPTIONS | ||||||||||||
| -DLOGME_BUILD_STATIC=${_logme_static_opt} | ||||||||||||
| -DLOGME_BUILD_DYNAMIC=${_logme_dynamic_opt} | ||||||||||||
| -DLOGME_BUILD_TESTS=OFF | ||||||||||||
| -DUSE_JSONCPP=ON | ||||||||||||
| ${FEATURE_OPTIONS} | ||||||||||||
| ) | ||||||||||||
|
|
||||||||||||
| vcpkg_cmake_install() | ||||||||||||
|
|
||||||||||||
| vcpkg_cmake_config_fixup( | ||||||||||||
| PACKAGE_NAME logme | ||||||||||||
| CONFIG_PATH lib/cmake/logme | ||||||||||||
| ) | ||||||||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||
|
|
||||||||||||
| file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" | ||||||||||||
| DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" | ||||||||||||
| ) | ||||||||||||
|
|
||||||||||||
| file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") | ||||||||||||
|
|
||||||||||||
| if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") | ||||||||||||
| file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") | ||||||||||||
| endif() | ||||||||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I guess what is really needed is |
||||||||||||
|
|
||||||||||||
| vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") | ||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| logme provides CMake package config files. | ||
| In your CMakeLists.txt: | ||
|
|
||
| find_package(logme CONFIG REQUIRED) | ||
| target_link_libraries(your_target PRIVATE logme::logme) | ||
|
|
||
| The logme::logme target is stable for both static and shared builds. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| "name": "logme", | ||
| "version": "2.4.3", | ||
| "description": "Cross-platform C/C++ logging framework: channels and routing, multiple backends, colored output, and runtime dynamic control.", | ||
| "homepage": "https://github.com/efmsoft/logme", | ||
| "license": "Apache-2.0", | ||
| "dependencies": [ | ||
| "jsoncpp", | ||
| "vcpkg-cmake", | ||
| "vcpkg-cmake-config" | ||
| ], | ||
| "features": { | ||
| "examples": { | ||
| "description": "Build examples.", | ||
| "supports": "!uwp" | ||
| }, | ||
| "tools": { | ||
| "description": "Build command-line tools.", | ||
| "supports": "!uwp" | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| { | ||
|
vicroms marked this conversation as resolved.
|
||
| "versions": [ | ||
| { | ||
| "git-tree": "173a32b0bbec5733eb820835ad9b91aaf3b2a743", | ||
| "version": "2.4.3", | ||
| "port-version": 0 | ||
| }, | ||
| { | ||
| "git-tree": "4461159bc1698d26764846b92b7ea899fb56c4b2", | ||
| "version": "2.4.1", | ||
| "port-version": 1 | ||
| }, | ||
| { | ||
| "git-tree": "f6b7138d7313b2943269517a445ef877def6bd71", | ||
| "version": "2.4.1", | ||
| "port-version": 0 | ||
| }, | ||
| { | ||
| "git-tree": "5dd719e238c0a23527371d11641cfabddeb27341", | ||
| "version": "1.9.0", | ||
| "port-version": 0 | ||
| }, | ||
| { | ||
| "git-tree": "0de4c344a23e38f819b9d67f574c50c10c96a5e4", | ||
| "version": "1.6.0", | ||
| "port-version": 0 | ||
| } | ||
| ] | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Handled by
supportsin the manifest.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All suggested changes are now applied (examples removed, tools handled via vcpkg_copy_tools, config fixup simplified). Could you please re-review? Thanks!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We removed the tools feature entirely. The CLI utility is not required for the library package, and attempting to package it caused repeated issues with vcpkg_copy_tools and feature testing (especially on single-config triplets). To avoid fragile install logic and CI failures, we decided to ship only the library.