RepoMirrors/abuild
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/abuild.git synced 2025-01-27 01:34:23 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
newapkbuild.in
View File

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