Improve cmake style

2 files changed, 12 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e5541d551bb4..d6bf81f55eef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = qxmpp
 	pkgdesc = Cross-platform C++ XMPP client and server library
 	pkgver = 1.4.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/qxmpp-project/qxmpp
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 0d5f16f4cb77..af362019bbbc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgbase=qxmpp
 pkgname=('qxmpp' 'qxmpp-doc')
 pkgver=1.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Cross-platform C++ XMPP client and server library'
 arch=('i686' 'x86_64')
 url='https://github.com/qxmpp-project/qxmpp'
@@ -18,34 +18,34 @@ sha256sums=('2148162138eaf4b431a6ee94104f87877b85a589da803dff9433c698b4cf4f19')
 
 prepare() {
 	cd "$srcdir/$pkgname-$pkgver"
-	[ -d build ] || mkdir build
 	sed -i "s|^.*find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Network Xml).*$|set(QT_VERSION_MAJOR 5)|" CMakeLists.txt
 }
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver/build"
+	cd "$srcdir"
 	
-	cmake -DCMAKE_INSTALL_PREFIX=/usr \
+	cmake -S $pkgname-$pkgver -B build \
+	-DCMAKE_INSTALL_PREFIX=/usr \
 	-DBUILD_DOCUMENTATION=1 \
 	-DCMAKE_INSTALL_LIBDIR=lib \
 	-DBUILD_EXAMPLES=0 \
 	-DBUILD_TESTS=0 \
-	-DWITH_GSTREAMER=1 \
-	..
-	make
+	-DWITH_GSTREAMER=1
+
+	cmake --build build
 }
 
 package_qxmpp() {
-	cd "$srcdir/$pkgname-$pkgver/build"
-	make DESTDIR="$pkgdir" install
+	cd "$srcdir"
+	DESTDIR="$pkgdir" cmake --install build
 	rm -rf "$pkgdir/usr/share/doc"
 }
 
 package_qxmpp-doc(){
 	pkgdesc='Cross-platform C++ XMPP client and server library (documentation)'
 	arch=('any')
-	cd "$srcdir/$pkgbase-$pkgver/build"
-	make DESTDIR="$pkgdir" install
+	cd "$srcdir"
+	DESTDIR="$pkgdir" cmake --install build
 	rm -rf "$pkgdir/usr/include"
 	rm -rf "$pkgdir/usr/lib"
 }