diff --git a/cppcheck.spec b/cppcheck.spec index 7e263d8..52c8222 100644 --- a/cppcheck.spec +++ b/cppcheck.spec @@ -62,9 +62,9 @@ xsltproc --nonet -o man/manual.html \ mkdir objdir-%{_target_platform} cd objdir-%{_target_platform} # Upstream doesn't support shared libraries (unversioned solib) -%cmake .. -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=1 -DBUILD_GUI=1 -DBUILD_SHARED_LIBS:BOOL=OFF +%cmake .. -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=1 -DBUILD_GUI=1 -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_TESTS=1 # SMP make doesn't seem to work -make +make cppcheck %install rm -rf %{buildroot} @@ -81,13 +81,8 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} install -D -p -m 644 gui/icon.png %{buildroot}%{_datadir}/pixmaps/cppcheck.png %check -# CMake build doesn't have check... -CXXFLAGS="%{optflags} -DNDEBUG $(pcre-config --cflags)" \ - LDFLAGS="$RPM_LD_FLAGS" LIBS=-ltinyxml2 make TINYXML= \ - CFGDIR=$(pwd)/cfg \ - HAVE_RULES=yes \ - DB2MAN=%{_datadir}/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl \ - %{?_smp_mflags} check +cd objdir-%{_target_platform}/bin +./testrunner -g -q %clean rm -rf %{buildroot} @@ -107,6 +102,7 @@ rm -rf %{buildroot} %changelog * Fri Nov 13 2015 Susi Lehtola - 1.70-4 - Link whole archive (BZ #1280242), patch by Mamoru Tasaka. +- Compile and run tests using CMake. * Wed Nov 11 2015 Susi Lehtola - 1.70-3 - Enable HAVE_RULES.