Repository: nifi-minifi-cpp Updated Branches: refs/heads/master 469b9d1bd -> 8a66f7513
MINIFICPP-439 Prefer cmake3 command when available before using cmake. This closes #287. Signed-off-by: Aldrin Piri <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/commit/8a66f751 Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/8a66f751 Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/8a66f751 Branch: refs/heads/master Commit: 8a66f75132c1fc53063b7dd9086534fc96799d6e Parents: 469b9d1 Author: Aldrin Piri <[email protected]> Authored: Tue Mar 20 14:28:09 2018 -0400 Committer: Aldrin Piri <[email protected]> Committed: Tue Mar 20 15:59:46 2018 -0400 ---------------------------------------------------------------------- bootstrap.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/8a66f751/bootstrap.sh ---------------------------------------------------------------------- diff --git a/bootstrap.sh b/bootstrap.sh index fde636d..e6981d5 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -180,19 +180,19 @@ fi CMAKE_COMMAND="" -if [ -x "$(command -v cmake)" ]; then - CMAKE_COMMAND="cmake" -elif [ -x "$(command -v cmake3)" ]; then +if [ -x "$(command -v cmake3)" ]; then CMAKE_COMMAND="cmake3" +elif [ -x "$(command -v cmake)" ]; then + CMAKE_COMMAND="cmake" fi if [ -z "${CMAKE_COMMAND}" ]; then echo "CMAKE is not installed, attempting to install it..." bootstrap_cmake - if [ -x "$(command -v cmake)" ]; then - CMAKE_COMMAND="cmake" - elif [ -x "$(command -v cmake3)" ]; then + if [ -x "$(command -v cmake3)" ]; then CMAKE_COMMAND="cmake3" + elif [ -x "$(command -v cmake)" ]; then + CMAKE_COMMAND="cmake" fi fi
