From a6809c0dd0694ac0c1268ef6420f5c81edcc406a Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sun, 3 Jun 2018 21:28:28 +0900 Subject: [PATCH] cmake: don't override cmakeDir when set (#40687) When dontUseCmakeBuildDir is true (aka the default), it overrides cmakeDir regardless of the package configuration. While packaging netbee, I needed to both keep dontUseCmakeBuildDir to true (some hardcoded paths expect the build folder) and set cmakeDir (since CMakeList.txt was in a subfolder) which proved impossible. Here is the fix. --- pkgs/development/tools/build-managers/cmake/setup-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 8e3993fadc1..d37e25943b5 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -22,7 +22,7 @@ cmakeConfigurePhase() { if [ -z "$dontUseCmakeBuildDir" ]; then mkdir -p build cd build - cmakeDir=.. + cmakeDir=${cmakeDir:-..} fi if [ -z "$dontAddPrefix" ]; then