X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Fvom%2FCMakeLists.txt;h=4947235717e555d75a016422b2cf14bcdf574193;hb=7c0eb56f4;hp=d3557104fd8b01d5265d7a33508829019d9b5d0a;hpb=d4d7e8ad84cb24cee31f10d5bfedab715df65754;p=vpp.git

diff --git a/extras/vom/CMakeLists.txt b/extras/vom/CMakeLists.txt
index d3557104fd8..4947235717e 100644
--- a/extras/vom/CMakeLists.txt
+++ b/extras/vom/CMakeLists.txt
@@ -18,18 +18,29 @@ project(vom)
 include(CheckCCompilerFlag)
 include(CheckCXXCompilerFlag)
 
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
-  set(VOM_LIB_DIR_NAME lib64)
-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)")
-  set(VOM_LIB_DIR_NAME lib64)
-else()
-  set(VOM_LIB_DIR_NAME lib)
-endif()
+unset (VOM_LIB_VERSION)
+execute_process(
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+  COMMAND bash -c "git describe | cut -f1 -d- | cut -dv -f2"
+  OUTPUT_VARIABLE VOM_LIB_VERSION
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)
 
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${VOM_LIB_DIR_NAME})
+set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
 set(CMAKE_INSTALL_MESSAGE NEVER)
 
+find_package(VPP)
 find_package(Threads REQUIRED)
+find_package(Boost OPTIONAL_COMPONENTS system filesystem)
 
 add_subdirectory(vom)
+add_subdirectory(cmake)
+
+add_vpp_packaging(
+  NAME "vom"
+  VENDOR "fd.io"
+  DESCRIPTION "VPP Object Model"
+)