File tree Expand file tree Collapse file tree 2 files changed +12
-2
lines changed
prerequisites/install-functions Expand file tree Collapse file tree 2 files changed +12
-2
lines changed Original file line number Diff line number Diff line change 11
11
-I --install-version [arg] Install package version.
12
12
-j --num-threads [arg] Number of threads to use when invoking make. Default="1"
13
13
-l --list-packages Print packages this script can install.
14
- -m --with-cmake [arg] Use specified CMake installation. Default="cmake"
14
+ -m --with-cmake [arg] Use specified CMake installation.
15
15
-M --with-mpi [arg] Use specified MPI installation.
16
16
-n --no-color Disable color output.
17
17
-o --only-download Download (without building) the source for the package specified by -p or --package.
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