From 1087020a468f441bcc99b0e608cb642e58e5903b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 24 Jan 2016 12:18:56 -0600 Subject: [PATCH] cmake: invoke configure hooks correctly Otherwise, the multiple-outputs hooks will not fire correctly. --- pkgs/development/tools/build-managers/cmake/setup-hook.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 670376efdcab81..c4684e0376ce70 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -13,7 +13,7 @@ fixCmakeFiles() { } cmakeConfigurePhase() { - eval "$preConfigure" + runHook preConfigure if [ -z "$dontFixCmake" ]; then fixCmakeFiles . @@ -53,7 +53,7 @@ cmakeConfigurePhase() { cmake ${cmakeDir:-.} $cmakeFlags "${cmakeFlagsArray[@]}" - eval "$postConfigure" + runHook postConfigure } if [ -z "$dontUseCmakeConfigure" -a -z "$configurePhase" ]; then