Skip to content

Commit 0f81a4c

Browse files
Merge pull request #3 from connectivecpp/develop
Merge develop to main
2 parents dbd4d37 + e33a270 commit 0f81a4c

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
![GH Tag](https://img.shields.io/github/v/tag/connectivecpp/periodic-timer?label=GH%20tag)
1212

13+
![License](https://img.shields.io/badge/License-Boost%201.0-blue)
14+
1315
## Overview
1416

1517
`periodic_timer` is an asynchronous periodic timer that wraps and simplifies Asio timers when periodic callbacks are needed. The periodicity can be based on either a simple duration or on timepoints based on a duration.
@@ -38,7 +40,7 @@ Continuous integration workflows build and unit test on g++ (through Ubuntu), MS
3840

3941
The unit test code uses [Catch2](https://github.com/catchorg/Catch2). If the `PERIODIC_TIMER_BUILD_TESTS` flag is provided to Cmake (see commands below) the Cmake configure / generate will download the Catch2 library as appropriate using the [CPM.cmake](https://github.com/cpm-cmake/CPM.cmake) dependency manager. If Catch2 (v3 or greater) is already installed using a different package manager (such as Conan or vcpkg), the `CPM_USE_LOCAL_PACKAGES` variable can be set which results in `find_package` being attempted. Note that v3 (or later) of Catch2 is required.
4042

41-
Specific version (or branch) specs for the Catch2 dependency is in `test/CMakeLists.txt`.
43+
Specific version (or branch) specs for the Catch2 dependency is in the [test/CMakeLists.txt](test/CMakeLists.txt) file, look for the `CPMAddPackage` command.
4244

4345
## Build and Run Unit Tests
4446

cmake/download_asio_cpm.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ set ( THREADS_PREFER_PTHREAD_FLAG TRUE )
1111
find_package ( Threads REQUIRED )
1212

1313
include ( cmake/download_cpm.cmake )
14-
CPMAddPackage ( "gh:chriskohlhoff/asio#asio-1-30-2@1.30.2" )
14+
CPMAddPackage ( "gh:chriskohlhoff/asio#asio-1-31-0@1.31.0" )
1515

1616
# ASIO doesn't use CMake, we have to configure it manually. Extra notes for using on Windows:
1717
#

test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ target_compile_features ( periodic_timer_test PRIVATE cxx_std_20 )
1515
# add dependencies
1616
include ( ../cmake/download_cpm.cmake )
1717

18-
CPMAddPackage ( "gh:catchorg/Catch2@3.6.0" )
18+
CPMAddPackage ( "gh:catchorg/Catch2@3.7.0" )
1919

2020
set ( CMAKE_THREAD_PREFER_PTHREAD TRUE )
2121
set ( THREADS_PREFER_PTHREAD_FLAG TRUE )

0 commit comments

Comments
 (0)