From 7b0566bc34262a5f6cd2efced99a15c2d7e9dcbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 2 Aug 2020 01:47:13 +0100 Subject: [PATCH] Fix cmake build --- vid.stab.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/vid.stab.spec b/vid.stab.spec index c65446a..d6005fd 100644 --- a/vid.stab.spec +++ b/vid.stab.spec @@ -1,3 +1,4 @@ +%undefine __cmake_in_source_build # https://github.com/georgmartius/vid.stab/commit/aeabc8daa7904f9edf7441a11f293965a5ef53b8 %global commit aeabc8daa7904f9edf7441a11f293965a5ef53b8 %global shortcommit %(c=%{commit}; echo ${c:0:7}) @@ -41,17 +42,17 @@ sed -i 's|-Wall -O0|-Wall -O|' tests/CMakeLists.txt sed -i 's|return units_failed==0;|return units_failed>0;|' tests/testframework.c %build -%cmake . -%make_build +%cmake +%cmake_build # build the tests program pushd tests -%cmake . -%make_build +%cmake +%cmake_build popd %install -%make_install +%cmake_install %check LD_LIBRARY_PATH=%{buildroot}%{_libdir} tests/tests || : @@ -72,6 +73,7 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} tests/tests || : * Sat Aug 01 2020 Fedora Release Engineering - 1.1.0-15.20190213gitaeabc8d - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild +- Fix cmake build * Wed Jul 29 2020 Fedora Release Engineering - 1.1.0-14.20190213gitaeabc8d - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild