Skip to content

A more inclusive handling of Catch2's use of __COUNTER__ #478

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
greenc-FNAL merged 3 commits into from
Apr 1, 2026
Merged

A more inclusive handling of Catch2's use of __COUNTER__ #478

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae95d30
A more inclusive handling of Catch2's use of `__COUNTER__`
greenc-FNAL Mar 30, 2026
d538963
An inclusive _and correct_ handling of Catch2's use of `__COUNTER__`
greenc-FNAL Apr 1, 2026
945b106
Move CATCH_CONFIG_NO_COUNTER to test/CMakeLists.txt to avoid superbui…
Copilot Apr 1, 2026
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
15 changes: 6 additions & 9 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ FetchContent_Declare(
FetchContent_Declare(
Catch2
GIT_REPOSITORY https://github.com/catchorg/Catch2.git
GIT_TAG v3.10.0
GIT_TAG v3.13.0
Comment thread
knoepfel marked this conversation as resolved.
GIT_SHALLOW ON
EXCLUDE_FROM_ALL # Do not install
FIND_PACKAGE_ARGS
Expand Down Expand Up @@ -90,6 +90,11 @@ set(CTEST_TEST_TIMEOUT 90 CACHE STRING "Per-test timeout (s) for CTest")
# Make tools available
FetchContent_MakeAvailable(Catch2 GSL mimicpp)

# Suppress Catch2's use of __COUNTER__ (a compiler extension, not standard C++)
# by propagating CATCH_CONFIG_NO_COUNTER to all consumers of Catch2::Catch2,
# regardless of whether Catch2 was resolved via find_package or FetchContent.
target_compile_definitions(Catch2::Catch2 INTERFACE CATCH_CONFIG_NO_COUNTER)

Comment thread
knoepfel marked this conversation as resolved.
Outdated
include(Modules/private/CreateCoverageTargets.cmake)

option(ENABLE_TSAN "Enable Thread Sanitizer" OFF)
Expand Down Expand Up @@ -136,14 +141,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
endif()
endif()

# Catch2's TEST_CASE macro uses __COUNTER__, which Clang >= 22 flags as a C2y
# extension under -pedantic. Suppress the warning to avoid -Werror failures.
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "22")
add_compile_options(-Wno-c2y-extensions)
endif()
endif()

set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)

Expand Down
Loading