cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

cmake: invoke configure hooks correctly

Browse source 
Otherwise, the multiple-outputs hooks will not fire correctly.
This commit is contained in:
Thomas Tuegel 2016-01-24 12:18:56 -06:00
parent 4465f438de
commit 1087020a46
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/tools/build-managers/cmake/setup-hook.sh
View file

@ -13,7 +13,7 @@ fixCmakeFiles() {
} }
cmakeConfigurePhase() { cmakeConfigurePhase() {
eval "$preConfigure" runHook preConfigure
if [ -z "$dontFixCmake" ]; then if [ -z "$dontFixCmake" ]; then
fixCmakeFiles . fixCmakeFiles .
@ -53,7 +53,7 @@ cmakeConfigurePhase() {
cmake ${cmakeDir:-.} $cmakeFlags "${cmakeFlagsArray[@]}" cmake ${cmakeDir:-.} $cmakeFlags "${cmakeFlagsArray[@]}"
eval "$postConfigure" runHook postConfigure
} }
if [ -z "$dontUseCmakeConfigure" -a -z "$configurePhase" ]; then if [ -z "$dontUseCmakeConfigure" -a -z "$configurePhase" ]; then