Skip to content

Commit ec92fc2

Browse files
Merge pull request #23 from connectivecpp/develop
Merge Develop to Main
2 parents ec6201c + 440ced7 commit ec92fc2

File tree

6 files changed

+16
-8
lines changed

6 files changed

+16
-8
lines changed

README.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ Concepts and various type constraints have been added. Enhancements are always a
2828

2929
The generated Doxygen documentation for `wait_queue` is [here](https://connectivecpp.github.io/wait-queue/).
3030

31-
## Dependencies
31+
## Library Dependencies
3232

33-
The `wait_queue` header file does not have any third-party dependencies. It uses C++ standard library headers only. The unit test code does have dependencies as noted below.
33+
The `wait_queue` header file does not have any third-party dependencies. It uses C++ standard library headers only. The unit test and example code do have dependencies as noted below.
3434

3535
## C++ Standard
3636

@@ -51,6 +51,10 @@ The unit test uses two third-party libraries (each is a single header-only file)
5151

5252
Specific version (or branch) specs for the dependencies are in the [test/CMakeLists.txt](test/CMakeLists.txt) file, look for the `CPMAddPackage` command.
5353

54+
## Example Dependencies
55+
56+
The example applications use the Connective C++ `shared_buffer` reference counted buffer classes. Specific version (or branch) specs for the dependency are in the [example/CMakeLists.txt](example/CMakeLists.txt) file, look for the `CPMAddPackage` command.
57+
5458
## Build and Run Unit Tests
5559

5660
To build and run the unit test program:
@@ -73,3 +77,7 @@ test/wait_queue_test -s
7377

7478
The example can be built by adding `-D WAIT_QUEUE_BUILD_EXAMPLES:BOOL=ON` to the CMake configure / generate step.
7579

80+
### CMake Version Compatibility
81+
82+
CMake 3.27 and later has removed (or will remove) compatibility with CMake versions older than 3.5. The GitHub actions for the `wait_queue` unit test have been updated to use the `CMAKE_POLICY_VERSION_MINIMUM=3.5` flag as a workaround (until the dependent library CMake files have been updated appropriately).
83+

cmake/download_cpm.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
file(
66
DOWNLOAD
7-
https://github.com/cpm-cmake/CPM.cmake/releases/download/v0.40.8/CPM.cmake
7+
https://github.com/cpm-cmake/CPM.cmake/releases/download/v0.42.0/CPM.cmake
88
${CMAKE_CURRENT_BINARY_DIR}/cmake/CPM.cmake
99
)
1010
include(${CMAKE_CURRENT_BINARY_DIR}/cmake/CPM.cmake)

example/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ cmake_minimum_required ( VERSION 3.14 FATAL_ERROR )
99
project ( wait_queue_example LANGUAGES CXX )
1010

1111
# add dependencies
12-
CPMAddPackage ( "gh:connectivecpp/shared-buffer@1.0.2" )
12+
CPMAddPackage ( "gh:connectivecpp/shared-buffer@1.0.5" )
1313

1414
# add executables
1515
add_executable ( wait_queue_example wait_queue_example.cpp )

include/queue/wait_queue.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* for specific use cases (see below for additional details). The default container
1515
* type is @c std::deque.
1616
*
17-
* A graceful shutdown can be requested using the @c request_stop method (modeled on the
17+
* A graceful shutdown can be requested using the @c std::request_stop method (modeled on the
1818
* C++ 20 @c request_stop from @c std::stop_source). This allows waiting reader threads
1919
* to be notified for shutdown. Alternatively a @c std::stop_token can be passed in to
2020
* the @c wait_queue constructor, allowing shutdown from outside of the @c wait_queue
@@ -142,7 +142,7 @@
142142
*
143143
* @authors Cliff Green, Lou Langholtz, Anthony Williams
144144
*
145-
* @copyright (c) 2017-2024 by Cliff Green
145+
* @copyright (c) 2017-2025 by Cliff Green
146146
*
147147
* Distributed under the Boost Software License, Version 1.0.
148148
* (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

test/CMakeLists.txt

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

18-
CPMAddPackage ( "gh:catchorg/Catch2@3.8.0" )
18+
CPMAddPackage ( "gh:catchorg/Catch2@3.11.0" )
1919
CPMAddPackage ( "gh:martinmoene/ring-span-lite@0.7.0" )
2020
# CPMAddPackage ( "gh:JustasMasiulis/circular_buffer@master" )
2121
CPMAddPackage ( NAME circular_buffer

test/wait_queue_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @author Cliff Green
66
*
7-
* @copyright (c) 2017-2024 by Cliff Green
7+
* @copyright (c) 2017-2025 by Cliff Green
88
*
99
* Distributed under the Boost Software License, Version 1.0.
1010
* (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

0 commit comments

Comments
 (0)