git » pulseview-git.git » commit 8015b27

Fix cmake usage to support other build systems

author Patrik Bachan
2024-10-05 22:54:00 UTC
committer Patrik Bachan
2024-10-05 22:54:00 UTC
parent f5cc6cb28b18424b4b78b215bfec46260ecdc2e3
Fix cmake usage to support other build systems

make PKGBUILD closer to guidelines
https://wiki.archlinux.org/title/CMake_package_guidelines

PKGBUILD now also works when cmake does not use `make`
as it is possible to change default build tool
to something different like `ninja`
.SRCINFO +1 -1
PKGBUILD +5 -5 
diff --git a/.SRCINFO b/.SRCINFO
index 54d21a9..f770781 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pulseview-git
 	pkgdesc = A Qt based logic analyzer GUI for sigrok. (git version)
-	pkgver = 0.3.0.r1150.gae8dd8753ec0
+	pkgver = 0.3.0.r1170.g32ca7966
 	pkgrel = 1
 	url = http://sigrok.org/wiki/Main_Page
 	arch = armv6h
diff --git a/PKGBUILD b/PKGBUILD
index 5dd96aa..4302d42 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 _gitname='pulseview'
 pkgname="${_gitname}-git"
-pkgver=0.3.0.r1150.gae8dd8753ec0
+pkgver=0.3.0.r1170.g32ca7966
 pkgrel=1
 pkgdesc="A Qt based logic analyzer GUI for sigrok. (git version)"
 arch=('armv6h' 'armv7h' 'i686' 'x86_64')
@@ -25,13 +25,13 @@ pkgver() {
 
 build() {
   cd "${srcdir}/${_gitname}"
-
-  cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_CXX_FLAGS=-fext-numeric-literals -DDISABLE_WERROR=TRUE .
-  make
+  
+  cmake -B build -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_CXX_FLAGS=-fext-numeric-literals -DDISABLE_WERROR=TRUE .
+  cmake --build build
 }
 
 package() {
   cd "${srcdir}/${_gitname}"
 
-  make DESTDIR="${pkgdir}" PREFIX=/usr install
+  DESTDIR="$pkgdir" cmake --install build
 }