Switch to cmake

This commit is contained in:
Nicolas Chauvet 2020-05-25 10:39:08 +02:00
parent 8bc64ac6f3
commit ec7a0070df

View File

@ -10,9 +10,10 @@ Patch0: https://github.com/dyne/frei0r/pull/94/commits/b27f03c8d51c34cd5
Patch1: https://github.com/dyne/frei0r/commit/7482c320b52956713d0b511771b23020fabd07a2.patch Patch1: https://github.com/dyne/frei0r/commit/7482c320b52956713d0b511771b23020fabd07a2.patch
Patch2: https://github.com/dyne/frei0r/commit/b4562db4ca20fefcce62dbe7b255c2b75951853e.patch Patch2: https://github.com/dyne/frei0r/commit/b4562db4ca20fefcce62dbe7b255c2b75951853e.patch
Patch3: https://github.com/dyne/frei0r/commit/b8d4e0595c8134b2b3c7e82ecb8da36c9354f68a.patch Patch3: https://github.com/dyne/frei0r/commit/b8d4e0595c8134b2b3c7e82ecb8da36c9354f68a.patch
Patch4: Switch-to-OpenCV4-enums.patch
Buildrequires: libtool Buildrequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: gavl-devel >= 0.2.3 BuildRequires: gavl-devel >= 0.2.3
@ -45,13 +46,16 @@ developing applications that use %{name}.
%build %build
mkdir -p m4 mkdir -p build
autoreconf -i cd build
%configure --disable-static %cmake -DCMAKE_INSTALL_LIBDIR=%{_lib} \
..
%make_build %make_build
%install %install
cd build
%make_install %make_install
#Remove installed doc #Remove installed doc
@ -77,6 +81,7 @@ rm -rf %{buildroot}%{_docdir}/%{name}
%changelog %changelog
* Mon May 25 2020 Nicolas Chauvet <kwizart@gmail.com> - 1.7.0-7 * Mon May 25 2020 Nicolas Chauvet <kwizart@gmail.com> - 1.7.0-7
- Apply patches from PR toward opencv4 support - Apply patches from PR toward opencv4 support
- Switch to cmake
* Fri Mar 06 2020 Nicolas Chauvet <kwizart@gmail.com> - 1.7.0-6 * Fri Mar 06 2020 Nicolas Chauvet <kwizart@gmail.com> - 1.7.0-6
- Update wip opencv patch - Update wip opencv patch