Skip to content

Commit 6be378b

Browse files
committed
Fix #404 -m/--with-cmake overrides default cmake
1 parent 268dd64 commit 6be378b

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

prerequisites/install-functions/find_or_install.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,17 @@ find_or_install()
6666
# Every branch that discovers an acceptable pre-existing installation must set the
6767
# CMAKE environment variable. Every branch must also manage the dependency stack.
6868

69-
if [[ "$script_installed_package" == true ]]; then
69+
# If the user specified a CMake binary, use it
70+
if [[ ! -z "${arg_m:-}" ]]; then
71+
72+
echo -e "$this_script: Using the $package specified by -m or --with-cmake: ${arg_m}\n"
73+
export CMAKE="${arg_m}"
74+
# Halt the recursion
75+
stack_push dependency_pkg "none"
76+
stack_push dependency_exe "none"
77+
stack_push dependency_path "none"
78+
79+
elif [[ "$script_installed_package" == true ]]; then
7080
echo -e "$this_script: Using the $package installed by $this_script\n"
7181
export CMAKE=$package_install_path/bin/$executable
7282
stack_push dependency_pkg "none"

0 commit comments

Comments
 (0)