diff --git a/ports/slick-logger/portfile.cmake b/ports/slick-logger/portfile.cmake index 43357faf58..7e240e6ebc 100644 --- a/ports/slick-logger/portfile.cmake +++ b/ports/slick-logger/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO SlickQuant/slick_logger + REPO SlickQuant/slick-logger REF "v${VERSION}" - SHA512 b61f81b80a7261a4fc32e6ab089888dac2f7b2c6b0875deefc56778a284c807148fe44f76bac9bd8a7bf271e39a817e7a0038812152ab07aaa627952b0d472f7 + SHA512 9b51e32f04f80330abefa680a11912841d24fb545dfb233933d02ce05a0411d0b2712d77fa6f5e44fac6606f1e28801c13ed1c89af239c354c736721ddad1129 HEAD_REF main PATCHES slick-queue.patch @@ -19,8 +19,8 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup( - PACKAGE_NAME slick_logger - CONFIG_PATH lib/cmake/slick_logger + PACKAGE_NAME slick-logger + CONFIG_PATH lib/cmake/slick-logger ) # Header-only library - remove lib directory diff --git a/ports/slick-logger/slick-queue.patch b/ports/slick-logger/slick-queue.patch index 628d27e210..cd65e1b8c9 100644 --- a/ports/slick-logger/slick-queue.patch +++ b/ports/slick-logger/slick-queue.patch @@ -1,22 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9b40db2..a5d0662 100644 +index 991f6af..bb6221c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -7,16 +7,7 @@ project(slick_logger +@@ -7,7 +7,7 @@ project(slick-logger set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) --include(FetchContent) -- --# Disable tests for slick_queue --set(BUILD_SLICK_QUEUE_TESTS OFF CACHE BOOL "" FORCE) --FetchContent_Declare( -- slick_queue -- GIT_REPOSITORY https://github.com/SlickQuant/slick_queue.git -- GIT_TAG v1.2.1 --) --FetchContent_MakeAvailable(slick_queue) -+find_package(slick_queue REQUIRED) +-find_package(slick-queue 1.2.2 CONFIG QUIET) ++find_package(slick-queue 1.2.2 CONFIG REQUIRED) - set(WARNING_MESSAGE "// ********** THIS FILE IS AUTO-GENERATED FROM src/logger.hpp ********** - // ********** DO NOT EDIT THIS FILE DIRECTLY ********** + if (NOT slick-queue_FOUND) + message(STATUS "Fetching slick-queue...") diff --git a/ports/slick-logger/vcpkg.json b/ports/slick-logger/vcpkg.json index 598cb11546..68b2e96fee 100644 --- a/ports/slick-logger/vcpkg.json +++ b/ports/slick-logger/vcpkg.json @@ -1,13 +1,16 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "slick-logger", - "version": "1.0.2", + "version": "1.0.4", "description": "A high-performance, cross-platform header-only logging library for C++20 using a multi-producer, multi-consumer ring buffer with multi-sink support and log rotation capabilities", - "homepage": "https://github.com/SlickQuant/slick_logger", + "homepage": "https://github.com/SlickQuant/slick-logger", "license": "MIT", "supports": "!uwp", "dependencies": [ - "slick-queue", + { + "name": "slick-queue", + "version>=": "1.2.2" + }, { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index 9f294d6f49..55105cde55 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9137,7 +9137,7 @@ "port-version": 0 }, "slick-logger": { - "baseline": "1.0.2", + "baseline": "1.0.4", "port-version": 0 }, "slick-net": { diff --git a/versions/s-/slick-logger.json b/versions/s-/slick-logger.json index aad735f7a3..78a9099627 100644 --- a/versions/s-/slick-logger.json +++ b/versions/s-/slick-logger.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7470c73c31d122513ee3f2b6e2a8c9e5f32cc906", + "version": "1.0.4", + "port-version": 0 + }, { "git-tree": "13342fb45843dd6264e172ef756ad5a40b7f69b3", "version": "1.0.2",