newapkbuild: make CMake packages use cmake --build directly rather than through make

This commit is contained in:
Bart Ribbers 2020-04-15 09:36:19 +02:00 committed by Natanael Copa
parent 51c03644ba
commit dd24cdf85f
1 changed files with 4 additions and 3 deletions

View File

@ -67,7 +67,7 @@ build_cmake() {
-DBUILD_SHARED_LIBS=True \\
-DCMAKE_BUILD_TYPE=None \\
\${CMAKE_CROSSOPTS} .
make -C build
cmake --build build
__EOF__
}
@ -124,7 +124,8 @@ __EOF__
check_cmake() {
cat >>APKBUILD<<__EOF__
CTEST_OUTPUT_ON_FAILURE=1 make -C build check
cd build
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
__EOF__
}
@ -162,7 +163,7 @@ __EOF__
package_cmake() {
cat >>APKBUILD<<__EOF__
make -C build DESTDIR="\$pkgdir" install
DESTDIR="\$pkgdir" cmake --build build --target install
__EOF__
}