From b47eed1ab00c304fe814bb97cb00dcf748362a2d Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Tue, 21 Jul 2020 08:06:25 +0200 Subject: [PATCH] Improve compatibility with new CMake macro Signed-off-by: Igor Raits --- plasma-breeze.spec | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/plasma-breeze.spec b/plasma-breeze.spec index deca928..973abd0 100644 --- a/plasma-breeze.spec +++ b/plasma-breeze.spec @@ -1,3 +1,5 @@ +%undefine __cmake_in_source_build + ## bootstrap, omit problematic optional build deps) #global bootstrap 1 @@ -108,31 +110,27 @@ Supplements: (kde-runtime and plasma-workspace) %build -mkdir %{_target_platform} -pushd %{_target_platform} -%{cmake_kf5} .. -popd - -%make_build -C %{_target_platform} +%{cmake_kf5} +%cmake_build %if 0%{?build_kde4} -mkdir %{_target_platform}_kde4 -pushd %{_target_platform}_kde4 -%{cmake_kde4} -DUSE_KDE4=TRUE .. -popd - -%make_build -C %{_target_platform}_kde4 +%global _vpath_builddir %{_target_platform}-kde4 +%{cmake_kde4} -DUSE_KDE4=TRUE -B %{_vpath_builddir} +%cmake_build +%undefine _vpath_builddir %endif %install -make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +%cmake_install %find_lang breeze --all-name %if 0%{?build_kde4} -make install/fast DESTDIR=%{buildroot} -C %{_target_platform}_kde4 +%global _vpath_builddir %{_target_platform}-kde4 +%cmake_install +%undefine _vpath_builddir %endif # omit/rename kde4breeze.upd, seems to be causing problems for