Skip to content

Merging Develop to main #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cliffg-softwarelibre merged 2 commits into from
Dec 12, 2025
Merged

Merging Develop to main #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af8fc14
Updating CPM download version
cliffg-softwarelibre Dec 12, 2025
c63af32
Updated Catch2 version and copyright years
cliffg-softwarelibre Dec 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/download_cpm.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

file(
DOWNLOAD
https://github.com/cpm-cmake/CPM.cmake/releases/download/v0.40.0/CPM.cmake
https://github.com/cpm-cmake/CPM.cmake/releases/download/v0.42.0/CPM.cmake
${CMAKE_CURRENT_BINARY_DIR}/cmake/CPM.cmake
)
include(${CMAKE_CURRENT_BINARY_DIR}/cmake/CPM.cmake)
2 changes: 1 addition & 1 deletion examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2024-2025 by Cliff Green
# Copyright (c) 2024-2026 by Cliff Green
#
# This CMake file invokes all of the example code CMake files for
# the presentations repository. Each subdirectory can be built
Expand Down
4 changes: 2 additions & 2 deletions examples/intro_generic_programming/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2024-2025 by Cliff Green
# Copyright (c) 2024-2026 by Cliff Green
#
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
Expand All @@ -15,7 +15,7 @@ target_compile_features ( intro_generic_programming_test PRIVATE cxx_std_20 )
# add dependencies
include ( ../../cmake/download_cpm.cmake )

CPMAddPackage ( "gh:catchorg/Catch2@3.8.0" )
CPMAddPackage ( "gh:catchorg/Catch2@3.11.0" )
CPMAddPackage ( "gh:TimQuelch/decimal#1.0.0" )

# link dependencies
Expand Down
4 changes: 2 additions & 2 deletions examples/std_span/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2024-2025 by Cliff Green
# Copyright (c) 2024-2026 by Cliff Green
#
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
Expand All @@ -15,7 +15,7 @@ target_compile_features ( std_span_test PRIVATE cxx_std_20 )
# add dependencies
include ( ../../cmake/download_cpm.cmake )

CPMAddPackage ( "gh:catchorg/Catch2@3.8.0" )
CPMAddPackage ( "gh:catchorg/Catch2@3.11.0" )

# link dependencies
target_link_libraries ( std_span_test PRIVATE Catch2::Catch2WithMain )
Expand Down
4 changes: 2 additions & 2 deletions examples/unit_test_with_catch2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2024-2025 by Cliff Green
# Copyright (c) 2024-2026 by Cliff Green
#
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
Expand All @@ -15,7 +15,7 @@ target_compile_features ( unit_test_with_catch2_test PRIVATE cxx_std_20 )
# add dependencies
include ( ../../cmake/download_cpm.cmake )

CPMAddPackage ( "gh:catchorg/Catch2@3.8.0" )
CPMAddPackage ( "gh:catchorg/Catch2@3.11.0" )

# link dependencies
target_link_libraries ( unit_test_with_catch2_test PRIVATE Catch2::Catch2WithMain )
Expand Down