newapkbuild: improve default cmake
- -G Ninja because that is always preferred - remove inferred trailing dot - use =ON as that is what we usually use most of the time for true/false - add samurai to makedeps for -G Ninja - use flatter ctest invocation
This commit is contained in:
parent
6576698918
commit
f810a11cfb
|
@ -67,12 +67,12 @@ build_cmake() {
|
||||||
if [ "\$CBUILD" != "\$CHOST" ]; then
|
if [ "\$CBUILD" != "\$CHOST" ]; then
|
||||||
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
|
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
|
||||||
fi
|
fi
|
||||||
cmake -B build \\
|
cmake -B build -G Ninja \\
|
||||||
-DCMAKE_INSTALL_PREFIX=/usr \\
|
-DCMAKE_INSTALL_PREFIX=/usr \\
|
||||||
-DCMAKE_INSTALL_LIBDIR=lib \\
|
-DCMAKE_INSTALL_LIBDIR=lib \\
|
||||||
-DBUILD_SHARED_LIBS=True \\
|
-DBUILD_SHARED_LIBS=ON \\
|
||||||
-DCMAKE_BUILD_TYPE=None \\
|
-DCMAKE_BUILD_TYPE=None \\
|
||||||
\$CMAKE_CROSSOPTS .
|
\$CMAKE_CROSSOPTS
|
||||||
cmake --build build
|
cmake --build build
|
||||||
__EOF__
|
__EOF__
|
||||||
}
|
}
|
||||||
|
@ -124,8 +124,7 @@ __EOF__
|
||||||
|
|
||||||
check_cmake() {
|
check_cmake() {
|
||||||
cat >>APKBUILD<<__EOF__
|
cat >>APKBUILD<<__EOF__
|
||||||
cd build
|
ctest --test-dir build --output-on-failure
|
||||||
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
|
|
||||||
__EOF__
|
__EOF__
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -252,7 +251,7 @@ newaport() {
|
||||||
|
|
||||||
case "$buildtype" in
|
case "$buildtype" in
|
||||||
python) makedepends="py3-setuptools";;
|
python) makedepends="py3-setuptools";;
|
||||||
cmake) makedepends="cmake";;
|
cmake) makedepends="cmake samurai";;
|
||||||
meson) makedepends="meson";;
|
meson) makedepends="meson";;
|
||||||
rust) makedepends="cargo";;
|
rust) makedepends="cargo";;
|
||||||
*) makedepends="\$depends_dev";;
|
*) makedepends="\$depends_dev";;
|
||||||
|
|
Loading…
Reference in New Issue