mirror of
https://gitlab.alpinelinux.org/alpine/abuild.git
synced 2025-01-11 17:29:52 +00:00
newapkbuild: make CMake packages use cmake --build directly rather than through make
This commit is contained in:
parent
51c03644ba
commit
dd24cdf85f
@ -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__
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user