ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

deb-pkg: Add libvom package support

Browse Source 
Change-Id: I370a5198ea5b768d8c505679662a19797bd2740d
Signed-off-by: Mohsin Kazmi <sykazmi@cisco.com>
This commit is contained in:
Mohsin Kazmi
2019-02-12 17:24:17 +01:00
committed by Damjan Marion
parent 364b1cad18
commit 752f5b4302
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -204,6 +204,7 @@ help:
@echo " test-help - show help on test framework"
@echo " run-vat - run vpp-api-test tool"
@echo " pkg-deb - build DEB packages"
@echo " vom-pkg-deb - build vom DEB packages"
@echo " pkg-rpm - build RPM packages"
@echo " install-ext-deps - install external development dependencies"
@echo " ctags - (re)generate ctags database"
@ -494,9 +495,17 @@ run-vat:
pkg-deb:
$(call make,$(PLATFORM),vpp-package-deb)
vom-pkg-deb:
$(call make,$(PLATFORM),vpp-package-deb)
$(call make,$(PLATFORM),vom-package-deb)
pkg-deb-debug:
$(call make,$(PLATFORM)_debug,vpp-package-deb)
vom-pkg-deb-debug:
$(call make,$(PLATFORM)_debug,vpp-package-deb)
$(call make,$(PLATFORM)_debug,vom-package-deb)
pkg-rpm: dist
make -C extras/rpm

4
build-data/packages/vom.mk
View File

@ -39,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) \;

16
extras/vom/vom/CMakeLists.txt
View File

@ -282,17 +282,11 @@ list(APPEND VOM_HEADERS
)
add_definitions(-Wall -Werror -std=gnu++11)
add_vpp_library(vom
SOURCES ${VOM_SOURCES}
INSTALL_HEADERS ${VOM_HEADERS}
LINK_LIBRARIES ${VPPAPICLIENT_LIB} ${VAPICLIENT_LIB} Threads::Threads
${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} m rt
COMPONENT libvom
)
add_library(vom SHARED ${VOM_SOURCES})
target_link_libraries(vom ${VPPAPICLIENT_LIB} ${VAPICLIENT_LIB} Threads::Threads
${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} m rt)
install(TARGETS vom DESTINATION lib COMPONENT vom)
install(FILES ${VOM_HEADERS} DESTINATION include/vom COMPONENT vom)
if (Boost_FOUND)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")