public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/HPCombi] rawhide: Use the cmake declarative buildsystem
@ 2026-07-13 22:26 Jerry James
0 siblings, 0 replies; only message in thread
From: Jerry James @ 2026-07-13 22:26 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/HPCombi
Branch : rawhide
Commit : 0b7c1237e801e04a0a00cf392317633921232cb6
Author : Jerry James <loganjerry@gmail.com>
Date : 2026-07-13T16:26:20-06:00
Stats : +14/-18 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/HPCombi/c/0b7c1237e801e04a0a00cf392317633921232cb6?branch=rawhide
Log:
Use the cmake declarative buildsystem
---
diff --git a/HPCombi.spec b/HPCombi.spec
index f6ac077..d62b32c 100644
--- a/HPCombi.spec
+++ b/HPCombi.spec
@@ -1,3 +1,6 @@
+# Whether to run tests
+%bcond ctest 1
+
# There are no ELF objects in this package, so turn off debuginfo generation.
%global debug_package %{nil}
@@ -20,9 +23,18 @@ Patch: %{name}-unbundle-simde.patch
# Limited support for architectures. Recheck this on each release.
ExclusiveArch: %{x86_64} %{arm64}
+BuildSystem: cmake
+%if %{with ctest}
+BuildOption(conf): -DBUILD_TESTING:BOOL=ON
+%endif
+%ifarch %{arm64}
+# Skip the EPU8 test; see https://github.com/libsemigroups/HPCombi/issues/70
+BuildOption(check): -E EPU8
+%endif
-BuildRequires: cmake
+%if %{with ctest}
BuildRequires: cmake(Catch2)
+%endif
BuildRequires: doxygen-latex
BuildRequires: gcc-c++
BuildRequires: pkgconfig(libsparsehash)
@@ -70,20 +82,13 @@ API documentation for HPCombi.
%prep
%autosetup -p1
-%conf
# Ensure we can't use the bundled simde
rm -fr third_party
# Install the pkgconfig file in the noarch directory
sed -i 's,lib/,share/,' CMakeLists.txt
-%build
-%cmake -DBUILD_TESTING:BOOL=ON
-%cmake_build
-
-%install
-%cmake_install
-
+%install -a
# We install license and documentation separately
rm -fr %{buildroot}%{_datadir}/hpcombi
@@ -104,15 +109,6 @@ for f in %{buildroot}%{_includedir}/hpcombi/*.hpp; do
fixtimestamp $f
done
-# There are currently no tests. Uncomment this when there are.
-%check
-%ifarch %{arm64}
-# Skip the EPU8 test; see https://github.com/libsemigroups/HPCombi/issues/70
-%ctest -E EPU8
-%else
-%ctest
-%endif
-
%files devel
%doc README.md
%license LICENSE
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-07-13 22:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-13 22:26 [rpms/HPCombi] rawhide: Use the cmake declarative buildsystem Jerry James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox