Skip to content

Commit 6c35fe5

Browse files
kzhdevkzhdev
committed
Upgrade slick_queue to v1.1.2; Added vcpkg integration; Bump version to 1.0.1
1 parent 28d0a40 commit 6c35fe5

File tree

7 files changed

+80
-18
lines changed

7 files changed

+80
-18
lines changed

‎CHANGELOG‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# v1.0.1 - 11-14-2025
2+
- Update slick_queue to v1.1.2
3+
- Added vcpkg integration
4+
- Changed version number to three digits
5+
- Added alias targets
6+
17
# v1.0.0.8 - 10-21-2025
28
- Update slick_queue to v1.1.0.2
39
- Change include folder from include/slick_logger to include/slick

‎CMakeLists.txt‎

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
cmake_minimum_required(VERSION 3.20)
22

3-
set(BUILD_VERSION 1.0.0.8)
4-
project(slick_logger VERSION ${BUILD_VERSION} LANGUAGES CXX)
3+
project(slick_logger
4+
VERSION 1.0.1
5+
LANGUAGES CXX)
56

67
set(CMAKE_CXX_STANDARD 20)
78
set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -13,7 +14,7 @@ set(BUILD_SLICK_QUEUE_TESTS OFF CACHE BOOL "" FORCE)
1314
FetchContent_Declare(
1415
slick_queue
1516
GIT_REPOSITORY https://github.com/SlickQuant/slick_queue.git
16-
GIT_TAG v1.1.0.2
17+
GIT_TAG v1.1.2
1718
)
1819
FetchContent_MakeAvailable(slick_queue)
1920

@@ -36,11 +37,12 @@ endif()
3637

3738
# Add header-only library
3839
add_library(slick_logger INTERFACE)
40+
add_library(slick::slick_logger ALIAS slick_logger)
3941
target_include_directories(slick_logger INTERFACE
4042
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
4143
$<INSTALL_INTERFACE:include>
4244
)
43-
target_link_libraries(slick_logger INTERFACE slick_queue)
45+
target_link_libraries(slick_logger INTERFACE slick::slick_queue)
4446

4547
message(STATUS "Slick Queue: ${slick_queue_SOURCE_DIR}")
4648

@@ -70,7 +72,39 @@ endif()
7072
# Installation rules
7173
install(DIRECTORY include/ DESTINATION include)
7274

73-
message(STATUS "slick_logger: ${BUILD_VERSION}")
75+
# Install CMake package configuration files for vcpkg
76+
install(TARGETS slick_logger EXPORT slick_loggerTargets)
77+
78+
install(EXPORT slick_loggerTargets
79+
FILE slick_loggerTargets.cmake
80+
NAMESPACE slick::
81+
DESTINATION share/slick_logger
82+
)
83+
84+
include(CMakePackageConfigHelpers)
85+
86+
# Generate the config file
87+
configure_package_config_file(
88+
${CMAKE_CURRENT_SOURCE_DIR}/cmake/slick_loggerConfig.cmake.in
89+
${CMAKE_CURRENT_BINARY_DIR}/slick_loggerConfig.cmake
90+
INSTALL_DESTINATION share/slick_logger
91+
)
92+
93+
# Generate version file
94+
write_basic_package_version_file(
95+
${CMAKE_CURRENT_BINARY_DIR}/slick_loggerConfigVersion.cmake
96+
VERSION ${PROJECT_VERSION}
97+
COMPATIBILITY SameMajorVersion
98+
)
99+
100+
# Install config files
101+
install(FILES
102+
${CMAKE_CURRENT_BINARY_DIR}/slick_loggerConfig.cmake
103+
${CMAKE_CURRENT_BINARY_DIR}/slick_loggerConfigVersion.cmake
104+
DESTINATION share/slick_logger
105+
)
106+
107+
message(STATUS "slick_logger: ${PROJECT_VERSION}")
74108

75109
if(CMAKE_BUILD_TYPE STREQUAL "Release")
76110
add_custom_target(dist_slick_logger ALL
@@ -82,7 +116,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "Release")
82116

83117
if (PROJECT_IS_TOP_LEVEL)
84118
add_custom_target(package_slick_logger ALL
85-
COMMAND ${CMAKE_COMMAND} -E tar "cfv" "${CMAKE_BINARY_DIR}/dist/slick_logger_${BUILD_VERSION}.zip" --format=zip "include"
119+
COMMAND ${CMAKE_COMMAND} -E tar "cfv" "${CMAKE_BINARY_DIR}/dist/slick_logger_${PROJECT_VERSION}.zip" --format=zip "include"
86120
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/dist"
87121
COMMENT "Creating zip archive"
88122
)

‎cmake/slick_loggerConfig.cmake.in‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
@PACKAGE_INIT@
2+
3+
include(CMakeFindDependencyMacro)
4+
5+
# Find slick_queue dependency
6+
find_dependency(slick_queue QUIET)
7+
8+
# If slick_queue is not found via find_package, try to fetch it
9+
if(NOT slick_queue_FOUND)
10+
include(FetchContent)
11+
set(BUILD_SLICK_QUEUE_TESTS OFF CACHE BOOL "" FORCE)
12+
FetchContent_Declare(
13+
slick_queue
14+
GIT_REPOSITORY https://github.com/SlickQuant/slick_queue.git
15+
GIT_TAG v1.1.2
16+
)
17+
FetchContent_MakeAvailable(slick_queue)
18+
endif()
19+
20+
include("${CMAKE_CURRENT_LIST_DIR}/slick_loggerTargets.cmake")
21+
22+
check_required_components(slick_logger)

‎examples/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ option(BUILD_SLICK_LOGGER_EXAMPLES "Build example executables" ON)
33

44
if(BUILD_SLICK_LOGGER_EXAMPLES)
55
add_executable(logger_example example.cpp)
6-
target_link_libraries(logger_example slick_logger)
6+
target_link_libraries(logger_example slick::slick_logger)
77

88
add_executable(multi_sink_example multi_sink_example.cpp)
9-
target_link_libraries(multi_sink_example slick_logger)
9+
target_link_libraries(multi_sink_example slick::slick_logger)
1010

1111
add_executable(timestamp_example timestamp_example.cpp)
12-
target_link_libraries(timestamp_example slick_logger)
12+
target_link_libraries(timestamp_example slick::slick_logger)
1313

1414
message(STATUS "Building slick_logger examples")
1515
else()

‎include/slick/logger.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555

5656
#define SLICK_LOGGER_VERSION_MAJOR 1
5757
#define SLICK_LOGGER_VERSION_MINOR 0
58-
#define SLICK_LOGGER_VERSION_PATCH 0
59-
#define SLICK_LOGGER_VERSION_TWEAK 8
60-
#define SLICK_LOGGER_VERSION "1.0.0.8"
58+
#define SLICK_LOGGER_VERSION_PATCH 1
59+
#define SLICK_LOGGER_VERSION_TWEAK
60+
#define SLICK_LOGGER_VERSION "1.0.1."
6161

6262
#ifndef SLICK_LOGGER_MAX_ARGS
6363
#define SLICK_LOGGER_MAX_ARGS 20

‎src/logger.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@
5454
#define SLICK_LOGGER_VERSION_MAJOR @slick_logger_VERSION_MAJOR@
5555
#define SLICK_LOGGER_VERSION_MINOR @slick_logger_VERSION_MINOR@
5656
#define SLICK_LOGGER_VERSION_PATCH @slick_logger_VERSION_PATCH@
57-
#define SLICK_LOGGER_VERSION_TWEAK @slick_logger_VERSION_TWEAK@
58-
#define SLICK_LOGGER_VERSION "@slick_logger_VERSION_MAJOR@.@slick_logger_VERSION_MINOR@.@slick_logger_VERSION_PATCH@.@slick_logger_VERSION_TWEAK@"
57+
#define SLICK_LOGGER_VERSION "@slick_logger_VERSION_MAJOR@.@slick_logger_VERSION_MINOR@.@slick_logger_VERSION_PATCH@"
5958

6059
#ifndef SLICK_LOGGER_MAX_ARGS
6160
#define SLICK_LOGGER_MAX_ARGS 20

‎tests/CMakeLists.txt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ if(BUILD_SLICK_LOGGER_TESTING)
88
include(FetchContent)
99
FetchContent_Declare(
1010
googletest
11-
URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip
11+
GIT_REPOSITORY https://github.com/google/googletest.git
12+
GIT_TAG v1.17.0
1213
)
1314
# For Windows: Prevent overriding the parent project's compiler/linker settings
1415
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
@@ -17,17 +18,17 @@ if(BUILD_SLICK_LOGGER_TESTING)
1718

1819
add_executable(slick_logger_tests test_logger.cpp)
1920
target_include_directories(slick_logger_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
20-
target_link_libraries(slick_logger_tests slick_logger GTest::gtest_main)
21+
target_link_libraries(slick_logger_tests slick::slick_logger GTest::gtest_main)
2122
add_test(NAME slick_logger_tests COMMAND slick_logger_tests)
2223

2324
add_executable(slick_logger_sink_tests test_sinks.cpp)
2425
target_include_directories(slick_logger_sink_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
25-
target_link_libraries(slick_logger_sink_tests slick_logger GTest::gtest_main)
26+
target_link_libraries(slick_logger_sink_tests slick::slick_logger GTest::gtest_main)
2627
add_test(NAME slick_logger_sink_tests COMMAND slick_logger_sink_tests)
2728

2829
add_executable(slick_logger_timestamp_tests test_timestamp.cpp)
2930
target_include_directories(slick_logger_timestamp_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
30-
target_link_libraries(slick_logger_timestamp_tests slick_logger GTest::gtest_main)
31+
target_link_libraries(slick_logger_timestamp_tests slick::slick_logger GTest::gtest_main)
3132
add_test(NAME slick_logger_timestamp_tests COMMAND slick_logger_timestamp_tests)
3233

3334
else()

0 commit comments

Comments
 (0)