X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=inline;f=build-data%2Fpackages%2Fvom.mk;h=fefd49ac84156380d74b049fab8ad3e4c82bfa33;hb=refs%2Fchanges%2F74%2F23974%2F34;hp=84b5bca86dd64013737c094618cea843a7fee449;hpb=255299c265c68a37157ecdf0d42bff8939b113fe;p=vpp.git diff --git a/build-data/packages/vom.mk b/build-data/packages/vom.mk index 84b5bca86dd..fefd49ac841 100644 --- a/build-data/packages/vom.mk +++ b/build-data/packages/vom.mk @@ -25,10 +25,7 @@ vom_cmake_args ?= vom_cmake_args += -DCMAKE_INSTALL_PREFIX:PATH=$(PACKAGE_INSTALL_DIR) vom_cmake_args += -DCMAKE_CXX_FLAGS="$($(TAG)_TAG_CPPFLAGS)" vom_cmake_args += -DCMAKE_SHARED_LINKER_FLAGS="$($(TAG)_TAG_LDFLAGS)" -vom_cmake_args += -DVPP_INCLUDE_DIR_HINT="$(PACKAGE_INSTALL_DIR)/../vpp/include" -vom_cmake_args += -DVPP_LIB_DIR_HINT="$(PACKAGE_INSTALL_DIR)/../vpp/lib64" -vom_cmake_args += -DCMAKE_INCLUDE_PATH="$(call installed_includes_fn, vpp)" -vom_cmake_args += -DCMAKE_LIBRARY_PATH="$(call installed_libs_fn, vpp)" +vom_cmake_args += -DCMAKE_PREFIX_PATH:PATH="$(PACKAGE_INSTALL_DIR)/../vpp" # Use devtoolset on centos 7 ifneq ($(wildcard /opt/rh/devtoolset-7/enable),) @@ -42,3 +39,7 @@ vom_configure = \ vom_build = $(CMAKE) --build $(PACKAGE_BUILD_DIR) -- $(MAKE_PARALLEL_FLAGS) vom_install = $(CMAKE) --build $(PACKAGE_BUILD_DIR) -- install + +vom-package-deb: vom-install + @$(CMAKE) --build $(PACKAGE_BUILD_DIR)/vom -- package + @find $(PACKAGE_BUILD_DIR)/vom -name '*.deb' -exec mv {} $(CURDIR) \;