Skip to content

Commit 066a270

Browse files
Merge pull request #18 from connectivecpp/develop
Merging Develop to main
2 parents 381d6c3 + c63af32 commit 066a270

5 files changed

Lines changed: 8 additions & 8 deletions

File tree

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.0/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)

examples/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2024-2025 by Cliff Green
1+
# Copyright (c) 2024-2026 by Cliff Green
22
#
33
# This CMake file invokes all of the example code CMake files for
44
# the presentations repository. Each subdirectory can be built

examples/intro_generic_programming/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2024-2025 by Cliff Green
1+
# Copyright (c) 2024-2026 by Cliff Green
22
#
33
# Distributed under the Boost Software License, Version 1.0.
44
# (See accompanying file LICENSE.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
@@ -15,7 +15,7 @@ target_compile_features ( intro_generic_programming_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:TimQuelch/decimal#1.0.0" )
2020

2121
# link dependencies

examples/std_span/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2024-2025 by Cliff Green
1+
# Copyright (c) 2024-2026 by Cliff Green
22
#
33
# Distributed under the Boost Software License, Version 1.0.
44
# (See accompanying file LICENSE.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
@@ -15,7 +15,7 @@ target_compile_features ( std_span_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

2020
# link dependencies
2121
target_link_libraries ( std_span_test PRIVATE Catch2::Catch2WithMain )

examples/unit_test_with_catch2/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2024-2025 by Cliff Green
1+
# Copyright (c) 2024-2026 by Cliff Green
22
#
33
# Distributed under the Boost Software License, Version 1.0.
44
# (See accompanying file LICENSE.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
@@ -15,7 +15,7 @@ target_compile_features ( unit_test_with_catch2_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

2020
# link dependencies
2121
target_link_libraries ( unit_test_with_catch2_test PRIVATE Catch2::Catch2WithMain )

0 commit comments

Comments
 (0)