From 508f3d67c9a9a2691fdcdb6e833155face290839 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Wed, 8 Jul 2020 17:05:19 +0200 Subject: [PATCH] Improve compatibility with new CMake macro Signed-off-by: Igor Raits --- quazip.spec | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/quazip.spec b/quazip.spec index 9e5d78c..3485b13 100644 --- a/quazip.spec +++ b/quazip.spec @@ -1,3 +1,5 @@ +%undefine __cmake_in_source_build + Name: quazip Version: 0.7.6 Release: 7%{?dist} @@ -63,19 +65,13 @@ for developing applications that use %{name}. %autosetup -p1 %build -mkdir build-qt4 -pushd build-qt4 -%cmake .. -DBUILD_WITH_QT4:BOOL=ON - -%make_build -popd - -mkdir build-qt5 -pushd build-qt5 -%cmake .. -DBUILD_WITH_QT4:BOOL=OFF +%global _vpath_builddir build-qt4 +%cmake -DBUILD_WITH_QT4:BOOL=ON +%cmake_build -%make_build -popd +%global _vpath_builddir build-qt5 +%cmake -DBUILD_WITH_QT4:BOOL=OFF +%cmake_build doxygen Doxyfile for file in doc/html/*; do @@ -83,8 +79,10 @@ for file in doc/html/*; do done %install -make install/fast DESTDIR=%{buildroot} -C build-qt5 -make install/fast DESTDIR=%{buildroot} -C build-qt4 +%global _vpath_builddir build-qt4 +%cmake_install +%global _vpath_builddir build-qt5 +%cmake_install %ldconfig_scriptlets