kfg/myold
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Updated ninja dependency.

Browse source
This commit is contained in:
László Valkó 2024-01-14 22:49:29 +01:00
parent ea1f4c329d
commit bb5bcefbb2
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
eclass/cmake-utils.eclass
View file

@ -145,7 +145,7 @@ case ${CMAKE_MAKEFILE_GENERATOR} in
BDEPEND="sys-devel/make"
;;
ninja)
BDEPEND="dev-util/ninja"
BDEPEND="app-alternatives/ninja"
;;
*)
eerror "Unknown value for \${CMAKE_MAKEFILE_GENERATOR}"
@ -257,13 +257,13 @@ _cmake_generator_to_use() {
# this could happen if ninja is manually enabled (eg. make.conf) but not installed
case ${EAPI} in
5|6)
if ! ROOT=/ has_version dev-util/ninja; then
die "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is not installed. Please install dev-util/ninja or unset CMAKE_MAKEFILE_GENERATOR."
if ! ROOT=/ has_version app-alternatives/ninja; then
die "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is not installed. Please install app-alternatives/ninja or unset CMAKE_MAKEFILE_GENERATOR."
fi
;;
*)
if ! has_version -b dev-util/ninja; then
die "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is not installed. Please install dev-util/ninja or unset CMAKE_MAKEFILE_GENERATOR."
if ! has_version -b app-alternatives/ninja; then
die "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is not installed. Please install app-alternatives/ninja or unset CMAKE_MAKEFILE_GENERATOR."
fi
;;
esac