Mercurial > vanilla

diff Templates/build/cmake.sh @ 1281:a4f885023c82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
misc: update CMake template
author David Demelier <markand@malikania.fr>
date Mon, 15 Nov 2021 09:10:11 +0100
parents 325631424c65
children
line wrap: on
line diff
--- a/Templates/build/cmake.sh	Mon Nov 15 09:09:26 2021 +0100
+++ b/Templates/build/cmake.sh	Mon Nov 15 09:10:11 2021 +0100
@@ -33,11 +33,10 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	tar -xvf $PKGNAME-$PKGVERSION.tar.gz
 	cd $PKGNAME-$PKGVERSION
 
-	mkdir build && cd build
-	cmake .. \
+	cmake -S . -B build \
 		-DBUILD_SHARED_LIBS=On \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_CXX_COMPILER="$CXX" \
@@ -45,9 +44,8 @@
 		-DCMAKE_C_COMPILER="$CC" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
 		-DCMAKE_INSTALL_PREFIX=
-	make VERBOSE=1
-	make install DESTDIR=$DESTDIR
-	cd ..
+	cmake --build build
+	DESTDIR=$DESTDIR cmake --build build --target install
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION