Merge branch 'master' into safer-prereq-urls

Author: zbeekman

install.sh-usage

@@ -11,7 +11,7 @@
   -I --install-version [arg]  Install package version.
   -j --num-threads [arg]      Number of threads to use when invoking make. Default="1"
   -l --list-packages          Print packages this script can install.
-  -m --with-cmake [arg]       Use specified CMake installation. Default="cmake"
+  -m --with-cmake [arg]       Use specified CMake installation.
   -M --with-mpi [arg]         Use specified MPI installation.
   -n --no-color               Disable color output.
   -o --only-download          Download (without building) the source for the package specified by -p or --package.

prerequisites/install-functions/find_or_install.sh

@@ -66,7 +66,17 @@ find_or_install()
     # Every branch that discovers an acceptable pre-existing installation must set the
     # CMAKE environment variable. Every branch must also manage the dependency stack.
 
-    if [[ "$script_installed_package" == true ]]; then
+    # If the user specified a CMake binary, use it
+    if [[ ! -z "${arg_m:-}" ]]; then
+
+      echo -e "$this_script: Using the $package specified by -m or --with-cmake: ${arg_m}\n"
+      export CMAKE="${arg_m}"
+      # Halt the recursion
+      stack_push dependency_pkg "none"
+      stack_push dependency_exe "none"
+      stack_push dependency_path "none"
+
+    elif [[ "$script_installed_package" == true ]]; then
       echo -e "$this_script: Using the $package installed by $this_script\n"
       export CMAKE=$package_install_path/bin/$executable
       stack_push dependency_pkg "none"