Fix cmake configuration

2 files changed, 8 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f86bc21637a4..0d2d166b6f9c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gf-git
 	pkgdesc = Gamedev Framework (gf) is a framework to build 2D games in C++17. It is based on SDL and OpenGL ES 2.0, and presents an API that is very similar to the graphics module of SFML with additional features (development version).
-	pkgver = 1.0.0.r1606.bb7b6e6-1
+	pkgver = 1.0.0.r1607.877e07e
 	pkgrel = 1
 	url = https://gamedevframework.github.io/
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 4bdcd82cae22..fb0e3eea6799 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Arthur HUGEAT <hugeat dot arthur at gmail dot com>
 pkgname=gf-git
-pkgver=1.0.0.r1606.bb7b6e6
+pkgver=1.0.0.r1607.877e07e
 pkgrel=1
 pkgdesc="Gamedev Framework (gf) is a framework to build 2D games in C++17. It is based on SDL and OpenGL ES 2.0, and presents an API that is very similar to the graphics module of SFML with additional features (development version)."
 arch=('x86_64' 'i686')
@@ -35,19 +35,17 @@ build() {
         -DGF_SINGLE_COMPILTATION_UNIT=ON \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr \
-        .
-  make
+        -S ${srcdir}/gf \
+        -B ${srcdir}/build
+  cmake --build ${srcdir}/build --parallel
 }
 
 check() {
-  cd "${srcdir}/gf"
-  make test
+  ctest --test-dir ${srcdir}/build/tests
 }
 
 package() {
-	cd "${srcdir}/gf"
-
-	make DESTDIR="$pkgdir/" install
+  cmake --install ${srcdir}/build --prefix ${pkgdir}/usr
 	mv ${pkgdir}/usr/share/doc/GF ${pkgdir}/usr/share/doc/gf
-	install -Dm644 LICENSE.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt
+	install -Dm644 ${srcdir}/gf/LICENSE.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt
 }