Use new CMake macros everywhere

And update %cmake_liri.
lirios · Oct 11, 2020 · 23ea608 · 23ea608
1 parent d32768f
commit 23ea608
Show file tree

Hide file tree

Showing 30 changed files with 151 additions and 191 deletions.
diff --git a/fluid/fluid.spec b/fluid/fluid.spec
@@ -1,3 +1,5 @@
+%undefine __cmake_in_source_build
+
 %global snapdate @DATE@
 %global snaphash @HASH@
 
@@ -39,15 +41,12 @@ with the Material Design language.
 
 
 %build
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%{cmake_liri} -DFLUID_USE_SYSTEM_LCS:BOOL=ON ..
-popd
-make %{?_smp_mflags} -C %{_target_platform}
+%cmake_liri -DFLUID_USE_SYSTEM_LCS:BOOL=ON
+%cmake_build
 
 
 %install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%cmake_install
 
 
 %check

diff --git a/libliri/libliri.spec b/libliri/libliri.spec
@@ -1,3 +1,5 @@
+%undefine __cmake_in_source_build
+
 %global snapdate @DATE@
 %global snaphash @HASH@
 
@@ -40,15 +42,12 @@ developing applications that use %{name}.
 
 
 %build
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%{cmake_liri} ..
-popd
-make %{?_smp_mflags} -C %{_target_platform}
+%cmake_liri
+%cmake_build
 
 
 %install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%cmake_install
 
 
 %files

diff --git a/liri-appcenter/liri-appcenter.spec b/liri-appcenter/liri-appcenter.spec
@@ -1,3 +1,5 @@
+%undefine __cmake_in_source_build
+
 %global snapdate @DATE@
 %global snaphash @HASH@
 
@@ -47,15 +49,12 @@ Files for development of Liri AppCenter plugins.
 
 
 %build
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%{cmake_liri} ..
-popd
-make %{?_smp_mflags} -C %{_target_platform}
+%cmake_liri
+%cmake_build
 
 
 %install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%cmake_install
 
 
 %check

diff --git a/liri-browser/liri-browser.spec b/liri-browser/liri-browser.spec
@@ -1,3 +1,5 @@
+%undefine __cmake_in_source_build
+
 %global snapdate @DATE@
 %global snaphash @HASH@
 
@@ -39,15 +41,12 @@ the Liri desktop.
 
 
 %build
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%{cmake_liri} ..
-popd
-make %{?_smp_mflags} -C %{_target_platform}
+%cmake_liri
+%cmake_build
 
 
 %install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%cmake_install
 
 
 %check

diff --git a/liri-calamares-branding/liri-calamares-branding.spec b/liri-calamares-branding/liri-calamares-branding.spec
@@ -1,3 +1,5 @@
+%undefine __cmake_in_source_build
+
 %global snapdate @DATE@
 %global snaphash @HASH@
 
@@ -33,15 +35,12 @@ Liri OS branding and customizations for Calamares.
 
 
 %build
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%{cmake_liri} ..
-popd
-make %{?_smp_mflags} -C %{_target_platform}
+%cmake_liri
+%cmake_build
 
 
 %install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%cmake_install
 
 
 %check

diff --git a/liri-calculator/liri-calculator.spec b/liri-calculator/liri-calculator.spec
@@ -1,3 +1,5 @@
+%undefine __cmake_in_source_build
+
 %global snapdate @DATE@
 %global snaphash @HASH@
 
@@ -34,15 +36,12 @@ Material Design calculator.
 
 
 %build
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%{cmake_liri} ..
-popd
-make %{?_smp_mflags} -C %{_target_platform}
+%cmake_liri
+%cmake_build
 
 
 %install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%cmake_install
 
 
 %check

diff --git a/liri-cmake-shared/liri-cmake-shared.spec b/liri-cmake-shared/liri-cmake-shared.spec
@@ -1,3 +1,5 @@
+%undefine __cmake_in_source_build
+
 %global snapdate @DATE@
 %global snaphash @HASH@
 
@@ -38,25 +40,12 @@ RPM macros for building Liri packages.
 
 
 %build
-%if 0%{?fedora} >= 33
 %cmake
 %cmake_build
-%else
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%{cmake} ..
-popd
-make %{?_smp_mflags} -C %{_target_platform}
-%endif
 
 
 %install
-%if 0%{?fedora} >= 33
 %cmake_install
-%else
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%endif
-
 install -Dpm644 %{_sourcedir}/macros.liri %{buildroot}%{_rpmconfigdir}/macros.d/macros.liri
 
 

diff --git a/liri-cmake-shared/macros.liri b/liri-cmake-shared/macros.liri
@@ -2,14 +2,17 @@
 %_liri_libexecdir %_libexecdir/liri
 %_liri_buildtype release
 
-%cmake_liri \
+%cmake_liri \\\
+  %undefine __cmake_in_source_build \
   QTDIR="%{_qt5_prefix}" ; export QTDIR ; \
   PATH="%{_qt5_bindir}:$PATH" ; export PATH ; \
   CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
   FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \
   %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \
-  %{?fedora:%{__cmake}}%{?rhel:%{__cmake3}} \\\
+    %{__cmake} \\\
+    %{?__cmake_builddir:-S "%{_vpath_srcdir}"} \\\
+    %{?__cmake_builddir:-B "%{__cmake_builddir}"} \\\
     -DBUILD_TESTING:BOOL=FALSE \\\
     -DCMAKE_BUILD_TYPE=%{_liri_buildtype} \\\
     -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\

diff --git a/liri-eglfs/liri-eglfs.spec b/liri-eglfs/liri-eglfs.spec
@@ -1,3 +1,5 @@
+%undefine __cmake_in_source_build
+
 %define snapdate @DATE@
 %define snaphash @HASH@
 
@@ -48,15 +50,12 @@ developing applications that use %{name}.
 
 
 %build
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%{cmake_liri} ..
-popd
-make %{?_smp_mflags} -C %{_target_platform}
+%cmake_liri
+%cmake_build
 
 
 %install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%cmake_install
 rm -f %{buildroot}%{_libdir}/libLiri1{EdidSupport,KmsSupport,LibInput}.a
 rm -rf %{buildroot}%{_includedir}/Liri{EglFSDeviceIntegration,EglFSKmsSupport,EdidSupport,KmsSupport,LibInput}
 rm -f %{buildroot}%{_libdir}/libLiri1EglFS{DeviceIntegration,KmsSupport}.so

diff --git a/liri-files/liri-files.spec b/liri-files/liri-files.spec
@@ -1,3 +1,5 @@
+%undefine __cmake_in_source_build
+
 %global snapdate @DATE@
 %global snaphash @HASH@
 
@@ -34,15 +36,12 @@ Files is a file manager for Liri.
 
 
 %build
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%{cmake_liri} ..
-popd
-make %{?_smp_mflags} -C %{_target_platform}
+%cmake_liri
+%cmake_build
 
 
 %install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%cmake_install
 
 %find_lang %{name} --all-name --with-qt
 

diff --git a/liri-materialdecoration/liri-materialdecoration.spec b/liri-materialdecoration/liri-materialdecoration.spec
@@ -1,5 +1,7 @@
 # This package needs to be rebuilt every time Qt is updated.
 
+%undefine __cmake_in_source_build
+
 %global snapdate @DATE@
 %global snaphash @HASH@
 
@@ -28,15 +30,12 @@ Material Design decoration for Qt applications on Wayland.
 
 
 %build
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%{cmake_liri} ..
-popd
-make %{?_smp_mflags} -C %{_target_platform}
+%cmake_liri
+%cmake_build
 
 
 %install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%cmake_install
 
 
 %files

diff --git a/liri-networkmanager/liri-networkmanager.spec b/liri-networkmanager/liri-networkmanager.spec
@@ -1,3 +1,5 @@
+%undefine __cmake_in_source_build
+
 %global snapdate @DATE@
 %global snaphash @HASH@
 
@@ -40,15 +42,12 @@ to access network options from the Liri shell.
 
 
 %build
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%{cmake_liri} ..
-popd
-make %{?_smp_mflags} -C %{_target_platform}
+%cmake_liri
+%cmake_build
 
 
 %install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%cmake_install
 
 
 %files

diff --git a/liri-platformtheme/liri-platformtheme.spec b/liri-platformtheme/liri-platformtheme.spec
@@ -1,5 +1,7 @@
 # This package needs to be rebuilt every time Qt is updated.
 
+%undefine __cmake_in_source_build
+
 %global snapdate @DATE@
 %global snaphash @HASH@
 
@@ -29,15 +31,12 @@ Qt Platform Theme integration plugin for Liri.
 
 
 %build
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%{cmake_liri} ..
-popd
-make %{?_smp_mflags} -C %{_target_platform}
+%cmake_liri
+%cmake_build
 
 
 %install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%cmake_install
 
 
 %files

diff --git a/liri-power-manager/liri-power-manager.spec b/liri-power-manager/liri-power-manager.spec
@@ -1,3 +1,5 @@
+%undefine __cmake_in_source_build
+
 %global snapdate @DATE@
 %global snaphash @HASH@
 
@@ -40,17 +42,13 @@ settings module to configure power consumption settings.
 
 
 %build
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%{cmake_liri} \
-    -DINSTALL_SYSTEMDUSERUNITDIR:PATH=%{_userunitdir} \
-..
-popd
-make %{?_smp_mflags} -C %{_target_platform}
+%cmake_liri \
+    -DINSTALL_SYSTEMDUSERUNITDIR:PATH=%{_userunitdir}
+%cmake_build
 
 
 %install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%cmake_install
 
 
 %posttrans

diff --git a/liri-pulseaudio/liri-pulseaudio.spec b/liri-pulseaudio/liri-pulseaudio.spec
@@ -1,3 +1,5 @@
+%undefine __cmake_in_source_build
+
 %global snapdate @DATE@
 %global snaphash @HASH@
 
@@ -36,15 +38,12 @@ to access volume and media players from the Liri shell.
 
 
 %build
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%{cmake_liri} ..
-popd
-make %{?_smp_mflags} -C %{_target_platform}
+%cmake_liri
+%cmake_build
 
 
 %install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%cmake_install
 
 
 %files