[arch-commits] Commit in lib3mf-1/trunk (PKGBUILD)

Jonas Witschel diabonas at gemini.archlinux.org
Thu Apr 7 09:40:13 UTC 2022


    Date: Thursday, April 7, 2022 @ 09:40:13
  Author: diabonas
Revision: 1182780

lib3mf-1: use cmake instead of make everywhere

This purely cosmetic change brings the PKGBUILD in line with the template in
the current CMake package guidelines.

Modified:
  lib3mf-1/trunk/PKGBUILD

----------+
 PKGBUILD |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-07 09:21:02 UTC (rev 1182779)
+++ PKGBUILD	2022-04-07 09:40:13 UTC (rev 1182780)
@@ -27,12 +27,11 @@
 }
 
 build() {
-	cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_INCLUDEDIR="include/$pkgname" \
-	      -DCMAKE_BUILD_TYPE=None \
+	cmake -B build -S "${pkgname%-1}-$pkgver" -DCMAKE_BUILD_TYPE=None \
+	      -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_INCLUDEDIR="include/$pkgname" \
 	      -DUSE_INCLUDED_LIBZIP=OFF -DUSE_INCLUDED_ZLIB=OFF -DUSE_INCLUDED_GTEST=OFF \
-	      $( ((CHECKFUNC)) || echo -DLIB3MF_TESTS=OFF) \
-	      -B build -S "$srcdir/${pkgname%-1}-$pkgver"
-	make -C build
+	      $( ((CHECKFUNC)) || echo -DLIB3MF_TESTS=OFF)
+	cmake --build build
 }
 
 check() {
@@ -41,7 +40,6 @@
 }
 
 package() {
-	cd build
-	make DESTDIR="$pkgdir" install
-	install -Dm644 "$srcdir/${pkgname%-1}-$pkgver/LICENSE" -t "$pkgdir/usr/share/licenses/$pkgname"
+	DESTDIR="$pkgdir" cmake --install build
+	install -Dm644 "${pkgname%-1}-$pkgver/LICENSE" -t "$pkgdir/usr/share/licenses/$pkgname"
 }



More information about the arch-commits mailing list