Commit dd24cdf8 authored by Bart Ribbers's avatar Bart Ribbers Committed by Natanael Copa

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

parent 51c03644
......@@ -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__
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment