File tree Expand file tree Collapse file tree 1 file changed +11
-1
lines changed
prerequisites/install-functions Expand file tree Collapse file tree 1 file changed +11
-1
lines changed Original file line number Diff line number Diff line change @@ -66,7 +66,17 @@ find_or_install()
66
66
# Every branch that discovers an acceptable pre-existing installation must set the
67
67
# CMAKE environment variable. Every branch must also manage the dependency stack.
68
68
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
70
80
echo -e " $this_script : Using the $package installed by $this_script \n"
71
81
export CMAKE=$package_install_path /bin/$executable
72
82
stack_push dependency_pkg " none"
You can’t perform that action at this time.
0 commit comments