Skip to content

Update Catch2 from v2 to v3 #10119

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
cmsbuild merged 2 commits into from
Oct 14, 2025
Merged

Update Catch2 from v2 to v3 #10119

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
1b42c1e
Updates for Catch2 v2->v3 cmssw#49121
akritkbehera Oct 11, 2025
38c18f0
catch2: build shared libs, relocate .pc files; run verbose make
smuzaffar Oct 13, 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
26 changes: 22 additions & 4 deletions catch2.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,28 @@
### RPM external catch2 2.13.6
Source: https://raw.githubusercontent.com/catchorg/Catch2/v%{realversion}/single_include/catch2/catch.hpp
### RPM external catch2 3.11.0

Source: https://github.com/catchorg/Catch2/archive/refs/tags/v%{realversion}.tar.gz
BuildRequires: cmake gmake

%prep
%setup -n Catch2-%{realversion}

%build
cd %{_builddir}
rm -rf build && mkdir build && cd build

cmake ../Catch2-%{realversion} \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS=ON \
-DCMAKE_INSTALL_PREFIX="%{i}" \
-DCATCH_INSTALL_HELPERS=ON \
-DCATCH_INSTALL_EXTRAS=ON \
-DCMAKE_INSTALL_COMPONENT="devel"

make %{makeprocesses} VERBOSE=1

%install
mkdir %{i}/include
cp %{_sourcedir}/catch.hpp %{i}/include/
cd %{_builddir}/build
make install

%post
%{relocateConfig}share/pkgconfig/catch2*.pc
7 changes: 5 additions & 2 deletions scram-tools.file/tools/catch2/catch2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<tool name="@TOOL@" version="@TOOL_VERSION@" revision="2">
<tool name="@TOOL@" version="@TOOL_VERSION@" revision="3">
<lib name="Catch2Main"/>
<lib name="Catch2"/>
<client>
<environment name="@TOOL_BASE@" default="@TOOL_ROOT@"/>
<environment name="INCLUDE" default="$@TOOL_BASE@/include"/>
<environment name="INCLUDE" default="$@TOOL_BASE@/include"/>
<environment name="LIBDIR" default="$@TOOL_BASE@/lib64"/>
</client>
</tool>