build: check cmake3 command silently

Avoid which shell command to output verbose errors like
"""
which: no cmake3 in (/usr/sbin:/sbin:/bin: ...
"""

Type: make

Change-Id: Ib9a5fee72055b80b5e4e4c73280b19fea736c352
Signed-off-by: Nicolas PLANEL <[email protected]>

diff --git a/build-data/packages/libmemif.mk b/build-data/packages/libmemif.mk
index a4676af..111b6bd 100644 (file)
--- a/build-data/packages/libmemif.mk
+++ b/build-data/packages/libmemif.mk
@@ -14,7 +14,7 @@
 libmemif_source = extras
 libmemif_configure_subdir = libmemif
 
-ifneq ($(shell which cmake3),)
+ifneq ($(shell which cmake3 2>/dev/null),)
 CMAKE?=cmake3
 else
 CMAKE?=cmake

diff --git a/build-data/packages/sample-plugin.mk b/build-data/packages/sample-plugin.mk
index 546164c..4f9c553 100644 (file)
--- a/build-data/packages/sample-plugin.mk
+++ b/build-data/packages/sample-plugin.mk
@@ -18,7 +18,7 @@ sample-plugin_CPPFLAGS = $(call installed_includes_fn, vpp)
 sample-plugin_LDFLAGS = $(call installed_libs_fn, vpp)
 sample-plugin_PATH = $(call package_install_dir_fn,vpp)/bin
 
-ifneq ($(shell which cmake3),)
+ifneq ($(shell which cmake3 2>/dev/null),)
 CMAKE?=cmake3
 else
 CMAKE?=cmake

diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk
index cdd4065..62d35f1 100644 (file)
--- a/build-data/packages/vpp.mk
+++ b/build-data/packages/vpp.mk
@@ -13,7 +13,7 @@
 
 vpp_source = src
 
-ifneq ($(shell which cmake3),)
+ifneq ($(shell which cmake3 2>/dev/null),)
 CMAKE?=cmake3
 else
 CMAKE?=cmake

diff --git a/build/build_common.mk b/build/build_common.mk
index 88529a4..8f8a0a1 100644 (file)
--- a/build/build_common.mk
+++ b/build/build_common.mk
@@ -41,7 +41,7 @@ L := $(WORKSPACE)/archives/install-deps-logs
 $(shell rm -rf $(L) && mkdir -p $(L))
 endif
 
-ifneq ($(shell which cmake3),)
+ifneq ($(shell which cmake3 2>/dev/null),)
 CMAKE?=cmake3
 else
 CMAKE?=cmake

diff --git a/extras/deprecated/vom/vom.mk b/extras/deprecated/vom/vom.mk
index f284473..97fa900 100644 (file)
--- a/extras/deprecated/vom/vom.mk
+++ b/extras/deprecated/vom/vom.mk
@@ -15,7 +15,7 @@ vom_configure_depend = vpp-install
 vom_source = extras
 vom_configure_subdir = vom
 
-ifneq ($(shell which cmake3),)
+ifneq ($(shell which cmake3 2>/dev/null),)
 CMAKE?=cmake3
 else
 CMAKE?=cmake