X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build-data%2Fpackages%2Fvpp.mk;h=2a1b9a77de98d0d7e0cc9aeec719d9fc3c744d63;hb=6221927e9bad39c2856e844f8bc38947cb447f73;hp=412259110decef370a9845a775cc6b1959a695ca;hpb=8d0f2f0031589513833ab726a7bad5d9e19ff898;p=vpp.git

diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk
index 412259110de..2a1b9a77de9 100644
--- a/build-data/packages/vpp.mk
+++ b/build-data/packages/vpp.mk
@@ -13,36 +13,34 @@
 
 vpp_source = src
 
-ifeq ($($(PLATFORM)_dpdk_shared_lib),yes)
-vpp_configure_args = --enable-dpdk-shared
+ifneq ($(shell which cmake3),)
+CMAKE?=cmake3
 else
-vpp_configure_args =
+CMAKE?=cmake
 endif
 
-# Platform dependent configure flags
-vpp_configure_args += $(vpp_configure_args_$(PLATFORM))
+vpp_cmake_prefix_path  = /opt/vpp/external/$(shell uname -m)
+vpp_cmake_prefix_path += $(PACKAGE_INSTALL_DIR)external
+vpp_cmake_prefix_path := $(subst $() $(),;,$(vpp_cmake_prefix_path))
 
-
-vpp_CPPFLAGS =
-vpp_LDFLAGS =
-
-ifneq ($($(PLATFORM)_uses_dpdk),no)
-ifeq ($($(PLATFORM)_uses_external_dpdk),yes)
-vpp_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir)
-vpp_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir)
-else
-vpp_configure_depend += dpdk-install
-vpp_CPPFLAGS += $(call installed_includes_fn, dpdk)/dpdk
-vpp_LDFLAGS += $(call installed_libs_fn, dpdk)
-vpp_CPPFLAGS += -I/usr/include/dpdk
-endif
-ifeq ($($(PLATFORM)_uses_dpdk_mlx5_pmd),yes)
-vpp_configure_args += --with-dpdk-mlx5-pmd
-endif
-else
-vpp_configure_args += --disable-dpdk-plugin
+vpp_cmake_args ?=
+vpp_cmake_args += -DCMAKE_INSTALL_PREFIX:PATH=$(PACKAGE_INSTALL_DIR)
+vpp_cmake_args += -DCMAKE_C_FLAGS="$($(TAG)_TAG_CFLAGS)"
+vpp_cmake_args += -DCMAKE_LINKER_FLAGS="$($(TAG)_TAG_LDFLAGS)"
+vpp_cmake_args += -DCMAKE_PREFIX_PATH:PATH="$(vpp_cmake_prefix_path)"
+ifeq ("$(V)","1")
+vpp_cmake_args += -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 endif
 
-ifeq ($($(PLATFORM)_enable_tests),yes)
-vpp_configure_args += --enable-tests
+# Use devtoolset on centos 7
+ifneq ($(wildcard /opt/rh/devtoolset-7/enable),)
+vpp_cmake_args += -DCMAKE_PROGRAM_PATH:PATH="/opt/rh/devtoolset-7/root/bin"
 endif
+
+vpp_configure_depend += external-install
+vpp_configure = \
+  cd $(PACKAGE_BUILD_DIR) && \
+  $(CMAKE) -G Ninja $(vpp_cmake_args) $(call find_source_fn,$(PACKAGE_SOURCE))
+#vpp_make_args = --no-print-directory
+vpp_build = $(CMAKE) --build $(PACKAGE_BUILD_DIR)
+vpp_install = $(CMAKE) --build $(PACKAGE_BUILD_DIR) -- install | grep -v 'Set runtime path'