From d04a718ce41e50d42601dfadef08718e77f3e477 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Aug 29 2020 14:37:47 +0000 Subject: adapt to CMake macro changes in fedora 33+ --- diff --git a/eigen3.spec b/eigen3.spec index 9a4a314..6c84d21 100644 --- a/eigen3.spec +++ b/eigen3.spec @@ -6,7 +6,7 @@ Name: eigen3 Version: 3.3.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A lightweight C++ template library for vector and matrix math License: MPLv2.0 and LGPLv2+ and BSD @@ -72,32 +72,30 @@ Developer documentation for Eigen. %build -mkdir %{_target_platform} -pushd %{_target_platform} -%cmake .. -DINCLUDE_INSTALL_DIR=%{_includedir}/eigen3 \ - -DBLAS_LIBRARIES="cblas" \ - -DSUPERLU_INCLUDES=%{_includedir}/SuperLU \ - -DSCOTCH_INCLUDES=%{_includedir} -DSCOTCH_LIBRARIES="scotch" \ - -DMETIS_INCLUDES=%{_includedir} -DMETIS_LIBRARIES="metis" \ - -DCMAKEPACKAGE_INSTALL_DIR=%{_datadir}/%{name} -popd +%cmake \ + -DINCLUDE_INSTALL_DIR=%{_includedir}/eigen3 \ + -DBLAS_LIBRARIES="cblas" \ + -DSUPERLU_INCLUDES=%{_includedir}/SuperLU \ + -DSCOTCH_INCLUDES=%{_includedir} -DSCOTCH_LIBRARIES="scotch" \ + -DMETIS_INCLUDES=%{_includedir} -DMETIS_LIBRARIES="metis" \ + -DCMAKEPACKAGE_INSTALL_DIR=%{_datadir}/%{name} -%make_build -C %{_target_platform} -%make_build doc -C %{_target_platform} +%cmake_build +%cmake_build --target doc -rm -f %{_target_platform}/doc/html/installdox -rm -f %{_target_platform}/doc/html/unsupported/installdox +rm -f %{_vpath_builddir}/doc/html/installdox +rm -f %{_vpath_builddir}/doc/html/unsupported/installdox %install -%make_install -C %{_target_platform} +%cmake_install %check # Run tests but make failures non-fatal. Note that upstream doesn't expect the # tests to pass consistently since they're seeded randomly. -#make_build buildtests -C %{_target_platform} -#make_build test -C %{_target_platform} test ARGS="-V" || : +#cmake_build --target buildtests +#cmake_build --target test -- test ARGS="-V" || : %files devel @@ -108,10 +106,13 @@ rm -f %{_target_platform}/doc/html/unsupported/installdox %{_datadir}/cmake/Modules/*.cmake %files doc -%doc %{_target_platform}/doc/html +%doc %{_vpath_builddir}/doc/html %changelog +* Sat Aug 29 2020 Fabio Valentini - 3.3.7-6 +- Adapt to CMake macros changes in fedora 33+. + * Mon Jul 27 2020 Fedora Release Engineering - 3.3.7-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild