qmake-hook.sh: qmakeFlags is an array
This commit is contained in:
parent
e4e3419096
commit
bddca5a91a
@ -1,14 +1,25 @@
|
|||||||
|
qmakeFlags=( $qmakeFlags )
|
||||||
|
|
||||||
|
qmakePrePhase() {
|
||||||
|
qmakeFlags=( \
|
||||||
|
"PREFIX=$out" \
|
||||||
|
"NIX_OUTPUT_OUT=$out" \
|
||||||
|
"NIX_OUTPUT_DEV=${!outputDev}" \
|
||||||
|
"NIX_OUTPUT_BIN=${!outputBin}" \
|
||||||
|
"NIX_OUTPUT_DOC=${!outputDev}/${qtDocPrefix:?}" \
|
||||||
|
"NIX_OUTPUT_QML=${!outputBin}/${qtQmlPrefix:?}" \
|
||||||
|
"NIX_OUTPUT_PLUGIN=${!outputBin}/${qtPluginPrefix:?}" \
|
||||||
|
"${qmakeFlags[@]}" \
|
||||||
|
)
|
||||||
|
}
|
||||||
|
prePhases+=" qmakePrePhase"
|
||||||
|
|
||||||
qmakeConfigurePhase() {
|
qmakeConfigurePhase() {
|
||||||
runHook preConfigure
|
runHook preConfigure
|
||||||
|
|
||||||
qmake PREFIX=$out \
|
echo "QMAKEPATH=$QMAKEPATH"
|
||||||
NIX_OUTPUT_OUT=$out \
|
echo qmake "${qmakeFlags[@]}"
|
||||||
NIX_OUTPUT_DEV=${!outputDev} \
|
qmake "${qmakeFlags[@]}"
|
||||||
NIX_OUTPUT_BIN=${!outputBin} \
|
|
||||||
NIX_OUTPUT_DOC=${!outputDev}/${qtDocPrefix:?} \
|
|
||||||
NIX_OUTPUT_QML=${!outputBin}/${qtQmlPrefix:?} \
|
|
||||||
NIX_OUTPUT_PLUGIN=${!outputBin}/${qtPluginPrefix:?} \
|
|
||||||
$qmakeFlags
|
|
||||||
|
|
||||||
if ! [[ -v enableParallelBuilding ]]; then
|
if ! [[ -v enableParallelBuilding ]]; then
|
||||||
enableParallelBuilding=1
|
enableParallelBuilding=1
|
||||||
|
@ -1 +1 @@
|
|||||||
qmakeFlags="$qmakeFlags${qmakeFlags:+ }QMAKE_LRELEASE=@dev@/bin/lrelease"
|
qmakeFlags+=( "QMAKE_LRELEASE=@dev@/bin/lrelease" )
|
||||||
|
Loading…
x
Reference in New Issue
Block a user