jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

build-style/cmake: use ninja as default generator

Browse source 
closes #28304
This commit is contained in:
John 2021-01-29 16:24:17 +01:00
parent bebf257aa2
commit 04715e12f6
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
common/build-style/cmake.sh
View file

@ -62,6 +62,7 @@ _EOF
cmake_args+=" -DCMAKE_INSTALL_SBINDIR=bin"
export CMAKE_GENERATOR="${CMAKE_GENERATOR:-Ninja}"
# Override flags: https://gitlab.kitware.com/cmake/cmake/issues/19590
CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
cmake ${cmake_args} ${configure_args} $(echo ${cmake_builddir}|sed \
@ -72,7 +73,7 @@ _EOF
}
do_build() {
: ${make_cmd:=make}
: ${make_cmd:=ninja}
cd ${cmake_builddir:=build}
${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
@ -92,14 +93,14 @@ do_check() {
fi
fi
: ${make_cmd:=make}
: ${make_cmd:=ninja}
: ${make_check_target:=test}
CTEST_OUTPUT_ON_FAILURE=TRUE ${make_cmd} ${make_check_args} ${make_check_target}
}
do_install() {
: ${make_cmd:=make}
: ${make_cmd:=ninja}
: ${make_install_target:=install}
cd ${cmake_builddir:=build}

2
common/environment/build-style/cmake.sh
View file

@ -1,5 +1,5 @@
if [ "$CHROOT_READY" ]; then
if [[ "$hostmakedepends" != *"cmake-bootstrap"* ]]; then
hostmakedepends+=" cmake"
hostmakedepends+=" cmake ninja"
fi
fi