X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=09a31083df2fd53ccf5a8c658029f9cbaf66ccc1;hb=612dd6a955e44d2c0fed1801fb8de585ca695c63;hp=f271811df26a421af2531d63186fec2ff53616e0;hpb=cc4a5e8089967f0c266e9c5ed319c38c111004cd;p=vpp.git diff --git a/Makefile b/Makefile index f271811df26..09a31083df2 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,10 @@ STARTUP_DIR?=$(PWD) MACHINE=$(shell uname -m) SUDO?=sudo +ifeq ($(findstring $(MAKECMDGOALS),verify pkg-deb pkg-rpm test),) +export vpp_uses_cmake?=yes +endif + ,:=, define disable_plugins $(if $(1), \ @@ -66,6 +70,7 @@ DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config DEB_DEPENDS += lcov chrpath autoconf indent clang-format libnuma-dev DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6 check DEB_DEPENDS += libboost-all-dev libffi-dev python-ply libmbedtls-dev +DEB_DEPENDS += cmake ninja-build ifeq ($(OS_VERSION_ID),14.04) DEB_DEPENDS += openjdk-8-jdk-headless DEB_DEPENDS += libssl-dev