[neon/extras/qcoro/Neon/release] debian: rules: factorize common cmake args

Pino Toscano null at kde.org
Wed May 4 12:31:29 BST 2022


Git commit 7782e58f7fdd5f3ef91bc824bb043523aa1fe4a2 by Pino Toscano.
Committed on 16/04/2022 at 10:20.
Pushed by jriddell into branch 'Neon/release'.

rules: factorize common cmake args

M  +3    -0    debian/changelog
M  +4    -2    debian/rules

https://invent.kde.org/neon/extras/qcoro/commit/7782e58f7fdd5f3ef91bc824bb043523aa1fe4a2

diff --git a/debian/changelog b/debian/changelog
index b98c06b..34757ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qcoro (0.4.0-5) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Factorize the common cmake arguments in qt5/qt6 builds in a single
+    variable.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sat, 16 Apr 2022 12:18:23 +0200
 
diff --git a/debian/rules b/debian/rules
index 61ab164..2b72105 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+CMAKE_ARGS = -DBUILD_SHARED_LIBS=ON
+
 %:
 	dh $@ --with pkgkde_symbolshelper
 
@@ -11,8 +13,8 @@ override_dh_auto_clean:
 	rm -rf build-Qt6
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DUSE_QT_VERSION=5 -DBUILD_SHARED_LIBS=ON
-	dh_auto_configure --builddirectory=build-Qt6  -- -DUSE_QT_VERSION=6 -DBUILD_SHARED_LIBS=ON
+	dh_auto_configure -- $(CMAKE_ARGS) -DUSE_QT_VERSION=5
+	dh_auto_configure --builddirectory=build-Qt6 -- $(CMAKE_ARGS) -DUSE_QT_VERSION=6
 
 override_dh_auto_build:
 	dh_auto_build



More information about the Neon-commits mailing list