diff options
author | Brad King <brad.king@kitware.com> | 2021-01-04 18:50:38 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2021-01-04 18:50:46 (GMT) |
commit | 5dafe89650522ee2a8504700f43c5799771275e6 (patch) | |
tree | 31036c77da70735465a89186335bd8c982174cb9 | |
parent | 4d70299c66d9a6ab757cd9a06b52c58ee14b286f (diff) | |
parent | d9a788b3565a066b8b91fd8991befbd044c4ebba (diff) | |
download | CMake-5dafe89650522ee2a8504700f43c5799771275e6.zip CMake-5dafe89650522ee2a8504700f43c5799771275e6.tar.gz CMake-5dafe89650522ee2a8504700f43c5799771275e6.tar.bz2 |
Merge topic 'posix-test-command'
d9a788b356 bootstrap: test -a|o is not POSIX
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5650
-rwxr-xr-x | bootstrap | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -944,11 +944,10 @@ while test $# != 0; do done # Make sure the generator is valid -if test "${cmake_bootstrap_generator}" != "MSYS Makefiles" -a \ - "${cmake_bootstrap_generator}" != "Unix Makefiles" -a \ - "${cmake_bootstrap_generator}" != "Ninja"; then - cmake_error 10 "Invalid generator: ${cmake_bootstrap_generator}" -fi +case "${cmake_bootstrap_generator}" in + 'MSYS Makefiles'|'Unix Makefiles'|'Ninja') ;; + *) cmake_error 10 "Invalid generator: ${cmake_bootstrap_generator}" +esac # If verbose, display some information about bootstrap if test -n "${cmake_verbose}"; then |