From 7340e9fd8fd7c1d79ead16b5afdb39d686652b35 Mon Sep 17 00:00:00 2001 From: Eduard Mishkurov Date: Tue, 13 Jan 2026 18:10:31 +0300 Subject: [PATCH 01/19] Add logme port --- ports/logme/portfile.cmake | 49 ++++++++++++++++++++++++++++++++++++++ ports/logme/usage | 8 +++++++ ports/logme/vcpkg.json | 25 +++++++++++++++++++ versions/baseline.json | 4 ++++ versions/l-/logme.json | 9 +++++++ 5 files changed, 95 insertions(+) create mode 100644 ports/logme/portfile.cmake create mode 100644 ports/logme/usage create mode 100644 ports/logme/vcpkg.json create mode 100644 versions/l-/logme.json diff --git a/ports/logme/portfile.cmake b/ports/logme/portfile.cmake new file mode 100644 index 00000000000000..e1a4a7dd528f81 --- /dev/null +++ b/ports/logme/portfile.cmake @@ -0,0 +1,49 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO efmsoft/logme + REF v1.6.0 + SHA512 6749152e0c79ae5979867b0368234459040f7dcac861d47585fce53095512d06c3a2325a6160b7a7ac53a34a5279419e0715a8f28ea8f00aee6cff40b5f0bf63 + HEAD_REF master +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + examples LOGME_BUILD_EXAMPLES + tests LOGME_BUILD_TESTS + tools LOGME_BUILD_TOOLS +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(_LOGME_BUILD_STATIC ON) + set(_LOGME_BUILD_DYNAMIC OFF) + set(_USE_LOGME_SHARED OFF) +else() + set(_LOGME_BUILD_STATIC OFF) + set(_LOGME_BUILD_DYNAMIC ON) + set(_USE_LOGME_SHARED ON) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DLOGME_BUILD_STATIC=${_LOGME_BUILD_STATIC} + -DLOGME_BUILD_DYNAMIC=${_LOGME_BUILD_DYNAMIC} + -DUSE_LOGME_SHARED=${_USE_LOGME_SHARED} + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME logme + CONFIG_PATH lib/cmake/logme +) + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/logme/usage b/ports/logme/usage new file mode 100644 index 00000000000000..fcd4478700df1a --- /dev/null +++ b/ports/logme/usage @@ -0,0 +1,8 @@ +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. diff --git a/ports/logme/vcpkg.json b/ports/logme/vcpkg.json new file mode 100644 index 00000000000000..3bbe8bdad1fc1e --- /dev/null +++ b/ports/logme/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "logme", + "version": "1.6.0", + "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": [ + "vcpkg-cmake", + "vcpkg-cmake-config" + ], + "features": { + "examples": { + "description": "Build examples." + }, + "tests": { + "description": "Build tests.", + "dependencies": [ + "gtest" + ] + }, + "tools": { + "description": "Build command-line tools." + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index c362153d170b2d..b41fedd01183de 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6008,6 +6008,10 @@ "baseline": "1.5.0", "port-version": 0 }, + "logme": { + "baseline": "1.6.0", + "port-version": 0 + }, "loguru": { "baseline": "2.1.0", "port-version": 6 diff --git a/versions/l-/logme.json b/versions/l-/logme.json new file mode 100644 index 00000000000000..0f18e2d6c50365 --- /dev/null +++ b/versions/l-/logme.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "78bd910013e457076b6d0b5a45e9eb730b642664", + "version": "1.6.0", + "port-version": 0 + } + ] +} From ed4d36eb4e72bf469aac7f2005c1d3934ca93627 Mon Sep 17 00:00:00 2001 From: Eduard Mishkurov Date: Wed, 14 Jan 2026 13:33:40 +0300 Subject: [PATCH 02/19] logme: skip gtest discovery when cross-compiling --- .../logme/disable-gtest-discovery-cross.patch | 42 +++++++++++++++++++ ports/logme/portfile.cmake | 19 ++++----- ports/logme/usage | 5 +-- 3 files changed, 53 insertions(+), 13 deletions(-) create mode 100644 ports/logme/disable-gtest-discovery-cross.patch diff --git a/ports/logme/disable-gtest-discovery-cross.patch b/ports/logme/disable-gtest-discovery-cross.patch new file mode 100644 index 00000000000000..f7b6b06f74e77c --- /dev/null +++ b/ports/logme/disable-gtest-discovery-cross.patch @@ -0,0 +1,42 @@ +--- a/tests/ChannelRedirect/CMakeLists.txt ++++ b/tests/ChannelRedirect/CMakeLists.txt +@@ -36,5 +36,10 @@ + target_compile_definitions(${PROJECT_NAME} PRIVATE LOGME_INRELEASE) + + include(GoogleTest) +-gtest_discover_tests(${PROJECT_NAME}) ++ ++if(NOT CMAKE_CROSSCOMPILING) ++ gtest_discover_tests(${PROJECT_NAME}) ++else() ++ message(STATUS "Skipping gtest_discover_tests() while cross-compiling") ++endif() + set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Tests") +--- a/tests/LevelFilter/CMakeLists.txt ++++ b/tests/LevelFilter/CMakeLists.txt +@@ -36,5 +36,10 @@ + target_compile_definitions(${PROJECT_NAME} PRIVATE LOGME_INRELEASE) + + include(GoogleTest) +-gtest_discover_tests(${PROJECT_NAME}) ++ ++if(NOT CMAKE_CROSSCOMPILING) ++ gtest_discover_tests(${PROJECT_NAME}) ++else() ++ message(STATUS "Skipping gtest_discover_tests() while cross-compiling") ++endif() + set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Tests") +--- a/tests/OutputFlags/CMakeLists.txt ++++ b/tests/OutputFlags/CMakeLists.txt +@@ -35,5 +35,10 @@ + target_compile_definitions(${PROJECT_NAME} PRIVATE LOGME_INRELEASE) + + include(GoogleTest) +-gtest_discover_tests(${PROJECT_NAME}) ++ ++if(NOT CMAKE_CROSSCOMPILING) ++ gtest_discover_tests(${PROJECT_NAME}) ++else() ++ message(STATUS "Skipping gtest_discover_tests() while cross-compiling") ++endif() + set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Tests") diff --git a/ports/logme/portfile.cmake b/ports/logme/portfile.cmake index e1a4a7dd528f81..3270a5212a5390 100644 --- a/ports/logme/portfile.cmake +++ b/ports/logme/portfile.cmake @@ -14,22 +14,21 @@ vcpkg_check_features( tools LOGME_BUILD_TOOLS ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(_LOGME_BUILD_STATIC ON) - set(_LOGME_BUILD_DYNAMIC OFF) - set(_USE_LOGME_SHARED OFF) -else() - set(_LOGME_BUILD_STATIC OFF) - set(_LOGME_BUILD_DYNAMIC ON) - set(_USE_LOGME_SHARED ON) -endif() +vcpkg_apply_patches( + SOURCE_PATH "${SOURCE_PATH}" + PATCHES + disable-gtest-discovery-cross.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" _LOGME_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" _LOGME_BUILD_DYNAMIC) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DLOGME_BUILD_STATIC=${_LOGME_BUILD_STATIC} -DLOGME_BUILD_DYNAMIC=${_LOGME_BUILD_DYNAMIC} - -DUSE_LOGME_SHARED=${_USE_LOGME_SHARED} + -DUSE_LOGME_SHARED=${_LOGME_BUILD_DYNAMIC} ${FEATURE_OPTIONS} ) diff --git a/ports/logme/usage b/ports/logme/usage index fcd4478700df1a..93ddcc6c131b1e 100644 --- a/ports/logme/usage +++ b/ports/logme/usage @@ -1,8 +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) +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. From fbea62e7132d2257cf922b3d94d9b3e5bc47edd7 Mon Sep 17 00:00:00 2001 From: Eduard Mishkurov Date: Wed, 14 Jan 2026 13:47:43 +0300 Subject: [PATCH 03/19] logme: fix cross gtest discovery and bump port-version --- versions/l-/logme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/logme.json b/versions/l-/logme.json index 0f18e2d6c50365..bffb272c6ff3a7 100644 --- a/versions/l-/logme.json +++ b/versions/l-/logme.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "78bd910013e457076b6d0b5a45e9eb730b642664", + "git-tree": "0de4c344a23e38f819b9d67f574c50c10c96a5e4", "version": "1.6.0", "port-version": 0 } From 15262bf562db3c006c5158b45494fd8a91dadf7b Mon Sep 17 00:00:00 2001 From: Eduard Mishkurov Date: Fri, 16 Jan 2026 17:49:35 +0300 Subject: [PATCH 04/19] logme: update to 2.4.1 + disable tests --- .../logme/disable-gtest-discovery-cross.patch | 42 ------------------- ports/logme/portfile.cmake | 31 +++++++------- ports/logme/vcpkg.json | 9 +--- versions/baseline.json | 2 +- versions/l-/logme.json | 10 +++++ 5 files changed, 30 insertions(+), 64 deletions(-) delete mode 100644 ports/logme/disable-gtest-discovery-cross.patch diff --git a/ports/logme/disable-gtest-discovery-cross.patch b/ports/logme/disable-gtest-discovery-cross.patch deleted file mode 100644 index f7b6b06f74e77c..00000000000000 --- a/ports/logme/disable-gtest-discovery-cross.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/tests/ChannelRedirect/CMakeLists.txt -+++ b/tests/ChannelRedirect/CMakeLists.txt -@@ -36,5 +36,10 @@ - target_compile_definitions(${PROJECT_NAME} PRIVATE LOGME_INRELEASE) - - include(GoogleTest) --gtest_discover_tests(${PROJECT_NAME}) -+ -+if(NOT CMAKE_CROSSCOMPILING) -+ gtest_discover_tests(${PROJECT_NAME}) -+else() -+ message(STATUS "Skipping gtest_discover_tests() while cross-compiling") -+endif() - set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Tests") ---- a/tests/LevelFilter/CMakeLists.txt -+++ b/tests/LevelFilter/CMakeLists.txt -@@ -36,5 +36,10 @@ - target_compile_definitions(${PROJECT_NAME} PRIVATE LOGME_INRELEASE) - - include(GoogleTest) --gtest_discover_tests(${PROJECT_NAME}) -+ -+if(NOT CMAKE_CROSSCOMPILING) -+ gtest_discover_tests(${PROJECT_NAME}) -+else() -+ message(STATUS "Skipping gtest_discover_tests() while cross-compiling") -+endif() - set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Tests") ---- a/tests/OutputFlags/CMakeLists.txt -+++ b/tests/OutputFlags/CMakeLists.txt -@@ -35,5 +35,10 @@ - target_compile_definitions(${PROJECT_NAME} PRIVATE LOGME_INRELEASE) - - include(GoogleTest) --gtest_discover_tests(${PROJECT_NAME}) -+ -+if(NOT CMAKE_CROSSCOMPILING) -+ gtest_discover_tests(${PROJECT_NAME}) -+else() -+ message(STATUS "Skipping gtest_discover_tests() while cross-compiling") -+endif() - set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Tests") diff --git a/ports/logme/portfile.cmake b/ports/logme/portfile.cmake index 3270a5212a5390..3fa8258861e34c 100644 --- a/ports/logme/portfile.cmake +++ b/ports/logme/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO efmsoft/logme - REF v1.6.0 - SHA512 6749152e0c79ae5979867b0368234459040f7dcac861d47585fce53095512d06c3a2325a6160b7a7ac53a34a5279419e0715a8f28ea8f00aee6cff40b5f0bf63 + REF v2.4.1 + SHA512 5a2e761c855a66fbec82235e47ec921ca0021f046447cc7cdb876a548786729e7695d6201843ba0359a5fea78de3261edf3d068ba85d1875600096adfcc05811 HEAD_REF master ) @@ -10,25 +10,24 @@ vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES examples LOGME_BUILD_EXAMPLES - tests LOGME_BUILD_TESTS tools LOGME_BUILD_TOOLS ) -vcpkg_apply_patches( - SOURCE_PATH "${SOURCE_PATH}" - PATCHES - disable-gtest-discovery-cross.patch -) - -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" _LOGME_BUILD_STATIC) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" _LOGME_BUILD_DYNAMIC) +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() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DLOGME_BUILD_STATIC=${_LOGME_BUILD_STATIC} - -DLOGME_BUILD_DYNAMIC=${_LOGME_BUILD_DYNAMIC} - -DUSE_LOGME_SHARED=${_LOGME_BUILD_DYNAMIC} + -DLOGME_BUILD_STATIC=${_logme_static_opt} + -DLOGME_BUILD_DYNAMIC=${_logme_dynamic_opt} + -DLOGME_BUILD_TESTS=OFF + -DUSE_JSONCPP=ON ${FEATURE_OPTIONS} ) @@ -45,4 +44,8 @@ file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" 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() + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/logme/vcpkg.json b/ports/logme/vcpkg.json index 3bbe8bdad1fc1e..884d9be31759c9 100644 --- a/ports/logme/vcpkg.json +++ b/ports/logme/vcpkg.json @@ -1,10 +1,11 @@ { "name": "logme", - "version": "1.6.0", + "version": "2.4.1", "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" ], @@ -12,12 +13,6 @@ "examples": { "description": "Build examples." }, - "tests": { - "description": "Build tests.", - "dependencies": [ - "gtest" - ] - }, "tools": { "description": "Build command-line tools." } diff --git a/versions/baseline.json b/versions/baseline.json index b41fedd01183de..a1f85f28a4e248 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6009,7 +6009,7 @@ "port-version": 0 }, "logme": { - "baseline": "1.6.0", + "baseline": "2.4.1", "port-version": 0 }, "loguru": { diff --git a/versions/l-/logme.json b/versions/l-/logme.json index bffb272c6ff3a7..a4032fa66824ae 100644 --- a/versions/l-/logme.json +++ b/versions/l-/logme.json @@ -1,5 +1,15 @@ { "versions": [ + { + "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", From 152ca678353e38de83c3b711f997f917bb496f8d Mon Sep 17 00:00:00 2001 From: Eduard Mishkurov Date: Tue, 27 Jan 2026 11:39:19 +0300 Subject: [PATCH 05/19] logme: disable examples/tools on UWP --- ports/logme/portfile.cmake | 7 +++++++ ports/logme/vcpkg.json | 7 +++++-- versions/baseline.json | 2 +- versions/l-/logme.json | 5 +++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/ports/logme/portfile.cmake b/ports/logme/portfile.cmake index 3fa8258861e34c..38b34a473c55fc 100644 --- a/ports/logme/portfile.cmake +++ b/ports/logme/portfile.cmake @@ -13,6 +13,13 @@ vcpkg_check_features( 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) diff --git a/ports/logme/vcpkg.json b/ports/logme/vcpkg.json index 884d9be31759c9..85d9e18376f9a5 100644 --- a/ports/logme/vcpkg.json +++ b/ports/logme/vcpkg.json @@ -1,6 +1,7 @@ { "name": "logme", "version": "2.4.1", + "port-version": 1, "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", @@ -11,10 +12,12 @@ ], "features": { "examples": { - "description": "Build examples." + "description": "Build examples.", + "supports": "!uwp" }, "tools": { - "description": "Build command-line tools." + "description": "Build command-line tools.", + "supports": "!uwp" } } } diff --git a/versions/baseline.json b/versions/baseline.json index a1f85f28a4e248..aa27af3fdc8431 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6010,7 +6010,7 @@ }, "logme": { "baseline": "2.4.1", - "port-version": 0 + "port-version": 1 }, "loguru": { "baseline": "2.1.0", diff --git a/versions/l-/logme.json b/versions/l-/logme.json index a4032fa66824ae..9c76bc903ee177 100644 --- a/versions/l-/logme.json +++ b/versions/l-/logme.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4461159bc1698d26764846b92b7ea899fb56c4b2", + "version": "2.4.1", + "port-version": 1 + }, { "git-tree": "f6b7138d7313b2943269517a445ef877def6bd71", "version": "2.4.1", From bf9008a19231f73790d64aa9913c031a9afba7e3 Mon Sep 17 00:00:00 2001 From: Eduard Mishkurov Date: Tue, 3 Feb 2026 10:22:44 +0300 Subject: [PATCH 06/19] logme: update to 2.4.3 --- ports/logme/portfile.cmake | 4 ++-- ports/logme/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/logme.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/logme/portfile.cmake b/ports/logme/portfile.cmake index 38b34a473c55fc..48666d53fefaf7 100644 --- a/ports/logme/portfile.cmake +++ b/ports/logme/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO efmsoft/logme - REF v2.4.1 - SHA512 5a2e761c855a66fbec82235e47ec921ca0021f046447cc7cdb876a548786729e7695d6201843ba0359a5fea78de3261edf3d068ba85d1875600096adfcc05811 + REF v2.4.3 + SHA512 343da7575848519861fa9f7c3987495d58fdd0d7fa2b22f77121230647bf233e98b743a6194a386c23479d940e4a88050d34447c77a730c8dcbacdf6f2b1727f HEAD_REF master ) diff --git a/ports/logme/vcpkg.json b/ports/logme/vcpkg.json index 85d9e18376f9a5..ab3372a570c0e1 100644 --- a/ports/logme/vcpkg.json +++ b/ports/logme/vcpkg.json @@ -1,7 +1,6 @@ { "name": "logme", - "version": "2.4.1", - "port-version": 1, + "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", diff --git a/versions/baseline.json b/versions/baseline.json index aa27af3fdc8431..4531cdedbf7444 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6009,8 +6009,8 @@ "port-version": 0 }, "logme": { - "baseline": "2.4.1", - "port-version": 1 + "baseline": "2.4.3", + "port-version": 0 }, "loguru": { "baseline": "2.1.0", diff --git a/versions/l-/logme.json b/versions/l-/logme.json index 9c76bc903ee177..ffa93728031a7b 100644 --- a/versions/l-/logme.json +++ b/versions/l-/logme.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "173a32b0bbec5733eb820835ad9b91aaf3b2a743", + "version": "2.4.3", + "port-version": 0 + }, { "git-tree": "4461159bc1698d26764846b92b7ea899fb56c4b2", "version": "2.4.1", From 8583d295fc4578489338ac06e6f416063185a4a9 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 3 Feb 2026 15:02:39 -0800 Subject: [PATCH 07/19] Delete usage and fix version database. --- ports/logme/portfile.cmake | 4 ---- ports/logme/usage | 7 ------- versions/l-/logme.json | 22 +--------------------- 3 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 ports/logme/usage diff --git a/ports/logme/portfile.cmake b/ports/logme/portfile.cmake index 48666d53fefaf7..b2e2b667c67fb4 100644 --- a/ports/logme/portfile.cmake +++ b/ports/logme/portfile.cmake @@ -45,10 +45,6 @@ vcpkg_cmake_config_fixup( CONFIG_PATH lib/cmake/logme ) -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") diff --git a/ports/logme/usage b/ports/logme/usage deleted file mode 100644 index 93ddcc6c131b1e..00000000000000 --- a/ports/logme/usage +++ /dev/null @@ -1,7 +0,0 @@ -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. diff --git a/versions/l-/logme.json b/versions/l-/logme.json index ffa93728031a7b..ead238b4fc4e98 100644 --- a/versions/l-/logme.json +++ b/versions/l-/logme.json @@ -1,29 +1,9 @@ { "versions": [ { - "git-tree": "173a32b0bbec5733eb820835ad9b91aaf3b2a743", + "git-tree": "929add6d86cff26656f46c999775a7dcd2c75858", "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 } ] } From 28d636d9c54746b4538d109b8c4ce9266d7cac55 Mon Sep 17 00:00:00 2001 From: Eduard Mishkurov Date: Wed, 4 Feb 2026 09:21:25 +0300 Subject: [PATCH 08/19] changelog: add 2.4.4 build fix entry --- ports/logme/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/logme/portfile.cmake b/ports/logme/portfile.cmake index b2e2b667c67fb4..86bb448fb36b65 100644 --- a/ports/logme/portfile.cmake +++ b/ports/logme/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO efmsoft/logme - REF v2.4.3 - SHA512 343da7575848519861fa9f7c3987495d58fdd0d7fa2b22f77121230647bf233e98b743a6194a386c23479d940e4a88050d34447c77a730c8dcbacdf6f2b1727f + REF v2.4.4 + SHA512 49e1e980d0c8079757d44e16e435dd8bea4c42f43c914d29d5f385e7bcd4068d461c1120b844bdc7c8cf6ced8fe9abc1ddef51f67f3cb04b1df46d2fbe71b40d HEAD_REF master ) From f071859e03c6d020c7d189fc784ac55e7a502bb5 Mon Sep 17 00:00:00 2001 From: Eduard Mishkurov Date: Wed, 4 Feb 2026 09:24:09 +0300 Subject: [PATCH 09/19] logme: update to 2.4.4 --- ports/logme/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/logme.json | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ports/logme/vcpkg.json b/ports/logme/vcpkg.json index ab3372a570c0e1..e64e85583b2a13 100644 --- a/ports/logme/vcpkg.json +++ b/ports/logme/vcpkg.json @@ -1,6 +1,6 @@ { "name": "logme", - "version": "2.4.3", + "version": "2.4.4", "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", diff --git a/versions/baseline.json b/versions/baseline.json index 4531cdedbf7444..3867647b46a21a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6009,7 +6009,7 @@ "port-version": 0 }, "logme": { - "baseline": "2.4.3", + "baseline": "2.4.4", "port-version": 0 }, "loguru": { diff --git a/versions/l-/logme.json b/versions/l-/logme.json index ead238b4fc4e98..1fdd42bf03cb7a 100644 --- a/versions/l-/logme.json +++ b/versions/l-/logme.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd91bd9fafc4cd5df3bd9c3402820745b4a3d058", + "version": "2.4.4", + "port-version": 0 + }, { "git-tree": "929add6d86cff26656f46c999775a7dcd2c75858", "version": "2.4.3", From 4df7b9ae762570a3d57a7c06c184c1d4bf4fd482 Mon Sep 17 00:00:00 2001 From: Eduard Mishkurov Date: Wed, 4 Feb 2026 09:35:35 +0300 Subject: [PATCH 10/19] ci: retrigger From ebe79f6d16a20d1a042171195b3251ebe7805f9b Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 4 Feb 2026 17:09:27 -0800 Subject: [PATCH 11/19] Fix version database again. --- versions/l-/logme.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/versions/l-/logme.json b/versions/l-/logme.json index 1fdd42bf03cb7a..7876aabb2b5b4b 100644 --- a/versions/l-/logme.json +++ b/versions/l-/logme.json @@ -4,11 +4,6 @@ "git-tree": "cd91bd9fafc4cd5df3bd9c3402820745b4a3d058", "version": "2.4.4", "port-version": 0 - }, - { - "git-tree": "929add6d86cff26656f46c999775a7dcd2c75858", - "version": "2.4.3", - "port-version": 0 } ] } From f4254e6af93206d4a9c1fcb2016b5c165126fc2c Mon Sep 17 00:00:00 2001 From: Eduard Mishkurov Date: Thu, 5 Feb 2026 14:09:27 +0300 Subject: [PATCH 12/19] logme: drop examples feature and install logmectl via vcpkg_copy_tools --- ports/logme/portfile.cmake | 42 +++++++++++++++++++++----------------- ports/logme/vcpkg.json | 4 ---- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ports/logme/portfile.cmake b/ports/logme/portfile.cmake index 86bb448fb36b65..afbfe99ec2666b 100644 --- a/ports/logme/portfile.cmake +++ b/ports/logme/portfile.cmake @@ -6,18 +6,13 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_check_features( - OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - examples LOGME_BUILD_EXAMPLES - tools LOGME_BUILD_TOOLS -) +set(_logme_build_tools OFF) +if("tools" IN_LIST FEATURES) + set(_logme_build_tools ON) +endif() -if(VCPKG_TARGET_IS_UWP) - list(APPEND FEATURE_OPTIONS - -DLOGME_BUILD_EXAMPLES=OFF - -DLOGME_BUILD_TOOLS=OFF - ) +if(VCPKG_TARGET_IS_UWP AND _logme_build_tools) + message(FATAL_ERROR "Feature 'tools' is not supported for UWP.") endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -34,21 +29,30 @@ vcpkg_cmake_configure( -DLOGME_BUILD_STATIC=${_logme_static_opt} -DLOGME_BUILD_DYNAMIC=${_logme_dynamic_opt} -DLOGME_BUILD_TESTS=OFF + -DLOGME_BUILD_EXAMPLES=OFF + -DLOGME_BUILD_TOOLS=${_logme_build_tools} -DUSE_JSONCPP=ON - ${FEATURE_OPTIONS} ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup( - PACKAGE_NAME logme - CONFIG_PATH lib/cmake/logme -) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/logme) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +if(_logme_build_tools) + # Upstream currently does not install the tool target. + # Install the built binaries manually so vcpkg_copy_tools can pick them up. + file(INSTALL + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/logmectl.exe" + DESTINATION "${CURRENT_PACKAGES_DIR}/bin" + ) + file(INSTALL + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/logmectl.exe" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" + ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + vcpkg_copy_tools(TOOL_NAMES logmectl AUTO_CLEAN) endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/logme/vcpkg.json b/ports/logme/vcpkg.json index e64e85583b2a13..600329efef1507 100644 --- a/ports/logme/vcpkg.json +++ b/ports/logme/vcpkg.json @@ -10,10 +10,6 @@ "vcpkg-cmake-config" ], "features": { - "examples": { - "description": "Build examples.", - "supports": "!uwp" - }, "tools": { "description": "Build command-line tools.", "supports": "!uwp" From 570f2e92592a00c9b5e4e56ea0b185b0f8bbf727 Mon Sep 17 00:00:00 2001 From: Eduard Mishkurov Date: Thu, 5 Feb 2026 15:24:20 +0300 Subject: [PATCH 13/19] logme: drop tools feature to avoid vcpkg_copy_tools issues --- ports/logme/portfile.cmake | 25 +------------------------ ports/logme/vcpkg.json | 8 +------- 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/ports/logme/portfile.cmake b/ports/logme/portfile.cmake index afbfe99ec2666b..f1d2aa31272677 100644 --- a/ports/logme/portfile.cmake +++ b/ports/logme/portfile.cmake @@ -6,15 +6,6 @@ vcpkg_from_github( HEAD_REF master ) -set(_logme_build_tools OFF) -if("tools" IN_LIST FEATURES) - set(_logme_build_tools ON) -endif() - -if(VCPKG_TARGET_IS_UWP AND _logme_build_tools) - message(FATAL_ERROR "Feature 'tools' is not supported for UWP.") -endif() - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(_logme_static_opt ON) set(_logme_dynamic_opt OFF) @@ -30,7 +21,7 @@ vcpkg_cmake_configure( -DLOGME_BUILD_DYNAMIC=${_logme_dynamic_opt} -DLOGME_BUILD_TESTS=OFF -DLOGME_BUILD_EXAMPLES=OFF - -DLOGME_BUILD_TOOLS=${_logme_build_tools} + -DLOGME_BUILD_TOOLS=OFF -DUSE_JSONCPP=ON ) @@ -38,20 +29,6 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/logme) -if(_logme_build_tools) - # Upstream currently does not install the tool target. - # Install the built binaries manually so vcpkg_copy_tools can pick them up. - file(INSTALL - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/logmectl.exe" - DESTINATION "${CURRENT_PACKAGES_DIR}/bin" - ) - file(INSTALL - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/logmectl.exe" - DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" - ) - - vcpkg_copy_tools(TOOL_NAMES logmectl AUTO_CLEAN) -endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/logme/vcpkg.json b/ports/logme/vcpkg.json index 600329efef1507..746d0566998a40 100644 --- a/ports/logme/vcpkg.json +++ b/ports/logme/vcpkg.json @@ -8,11 +8,5 @@ "jsoncpp", "vcpkg-cmake", "vcpkg-cmake-config" - ], - "features": { - "tools": { - "description": "Build command-line tools.", - "supports": "!uwp" - } - } + ] } From 8b31e635ce80a73fd052addb524e8e024e3fa02d Mon Sep 17 00:00:00 2001 From: Eduard Mishkurov Date: Thu, 5 Feb 2026 15:40:11 +0300 Subject: [PATCH 14/19] logme: bump port-version --- ports/logme/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/logme.json | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ports/logme/vcpkg.json b/ports/logme/vcpkg.json index 746d0566998a40..834ec593cf7378 100644 --- a/ports/logme/vcpkg.json +++ b/ports/logme/vcpkg.json @@ -1,6 +1,7 @@ { "name": "logme", "version": "2.4.4", + "port-version": 1, "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", diff --git a/versions/baseline.json b/versions/baseline.json index 3867647b46a21a..daec72043ed6ee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6010,7 +6010,7 @@ }, "logme": { "baseline": "2.4.4", - "port-version": 0 + "port-version": 1 }, "loguru": { "baseline": "2.1.0", diff --git a/versions/l-/logme.json b/versions/l-/logme.json index 7876aabb2b5b4b..b3fddc162fb83c 100644 --- a/versions/l-/logme.json +++ b/versions/l-/logme.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c17be1bf20acf81dbaec38ceaba0b390706d6440", + "version": "2.4.4", + "port-version": 1 + }, { "git-tree": "cd91bd9fafc4cd5df3bd9c3402820745b4a3d058", "version": "2.4.4", From a3c83057f64808a374fffadc69598ee9ea418f10 Mon Sep 17 00:00:00 2001 From: Eduard Mishkurov <83351607+efmsoft@users.noreply.github.com> Date: Fri, 6 Feb 2026 10:57:04 +0300 Subject: [PATCH 15/19] Update ports/logme/portfile.cmake Co-authored-by: Victor Romero --- ports/logme/portfile.cmake | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/ports/logme/portfile.cmake b/ports/logme/portfile.cmake index f1d2aa31272677..8e18cfceae76d3 100644 --- a/ports/logme/portfile.cmake +++ b/ports/logme/portfile.cmake @@ -6,13 +6,8 @@ vcpkg_from_github( HEAD_REF master ) -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() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" _logme_static_opt) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" _logme_dynamic_opt) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" From 7349a436c38e4d54333d26464e6e82218c2ea02d Mon Sep 17 00:00:00 2001 From: Eduard Mishkurov <83351607+efmsoft@users.noreply.github.com> Date: Fri, 6 Feb 2026 10:59:51 +0300 Subject: [PATCH 16/19] Update ports/logme/vcpkg.json Co-authored-by: Victor Romero --- ports/logme/vcpkg.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/logme/vcpkg.json b/ports/logme/vcpkg.json index 834ec593cf7378..746d0566998a40 100644 --- a/ports/logme/vcpkg.json +++ b/ports/logme/vcpkg.json @@ -1,7 +1,6 @@ { "name": "logme", "version": "2.4.4", - "port-version": 1, "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", From ba7bf40d907cb185aa1bad476f3b24152740a72f Mon Sep 17 00:00:00 2001 From: Eduard Mishkurov <83351607+efmsoft@users.noreply.github.com> Date: Fri, 6 Feb 2026 11:00:19 +0300 Subject: [PATCH 17/19] Update versions/baseline.json Co-authored-by: Victor Romero --- versions/baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index daec72043ed6ee..3867647b46a21a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6010,7 +6010,7 @@ }, "logme": { "baseline": "2.4.4", - "port-version": 1 + "port-version": 0 }, "loguru": { "baseline": "2.1.0", From a3c42b4c749811d6545a0600b735a47118d34416 Mon Sep 17 00:00:00 2001 From: Eduard Mishkurov Date: Fri, 6 Feb 2026 11:04:38 +0300 Subject: [PATCH 18/19] logme: regenerate versions database for 2.4.4 --- versions/l-/logme.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/versions/l-/logme.json b/versions/l-/logme.json index b3fddc162fb83c..4734b0953198c1 100644 --- a/versions/l-/logme.json +++ b/versions/l-/logme.json @@ -1,12 +1,7 @@ { "versions": [ { - "git-tree": "c17be1bf20acf81dbaec38ceaba0b390706d6440", - "version": "2.4.4", - "port-version": 1 - }, - { - "git-tree": "cd91bd9fafc4cd5df3bd9c3402820745b4a3d058", + "git-tree": "46699509062d58f8ca6275e04557eb71a500b6d2", "version": "2.4.4", "port-version": 0 } From b534e0ef40a73080826ff3b9463ee184675d178e Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Mon, 9 Feb 2026 11:43:29 -0800 Subject: [PATCH 19/19] vcpkg-cmake vcpkg-cmake-config host dependencies --- ports/logme/portfile.cmake | 3 +-- ports/logme/vcpkg.json | 10 ++++++++-- versions/l-/logme.json | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/logme/portfile.cmake b/ports/logme/portfile.cmake index 8e18cfceae76d3..38b16e624078fd 100644 --- a/ports/logme/portfile.cmake +++ b/ports/logme/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO efmsoft/logme - REF v2.4.4 + REF "v${VERSION}" SHA512 49e1e980d0c8079757d44e16e435dd8bea4c42f43c914d29d5f385e7bcd4068d461c1120b844bdc7c8cf6ced8fe9abc1ddef51f67f3cb04b1df46d2fbe71b40d HEAD_REF master ) @@ -24,7 +24,6 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/logme) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/logme/vcpkg.json b/ports/logme/vcpkg.json index 746d0566998a40..f89d21a4304ca8 100644 --- a/ports/logme/vcpkg.json +++ b/ports/logme/vcpkg.json @@ -6,7 +6,13 @@ "license": "Apache-2.0", "dependencies": [ "jsoncpp", - "vcpkg-cmake", - "vcpkg-cmake-config" + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/l-/logme.json b/versions/l-/logme.json index 4734b0953198c1..71170e9f10b057 100644 --- a/versions/l-/logme.json +++ b/versions/l-/logme.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "46699509062d58f8ca6275e04557eb71a500b6d2", + "git-tree": "eede1cb6626f8f8edd45249fa174376b17eb8b1a", "version": "2.4.4", "port-version": 0 }