diff options
| author |   YohanPipereau <ypiperea@cisco.com> | 2019-07-15 15:37:46 +0200 |
|---|---|---|
| committer | YohanPipereau <ypiperea@cisco.com> | 2019-07-26 15:29:05 +0200 |
| commit | 18561adfde80d6665e24262d70d18f916e2662e5 (patch) | |
| tree | 06683574ba18ee25012f77b18da7c0e35a5707aa /src/cmake | |
| parent | adc56bc5ddcdf947864d982cda809588b7ccd8bc (diff) | |
vom: migration from scvpp to vom
Change-Id: I79609f0bee9b8307da0d9bf704babe8ba06dba4d
Signed-off-by: YohanPipereau <ypiperea@cisco.com>
Co-authored-by: Pavel Kotucek <pavel.kotucek@pantheon.tech>
Co-authored-by: Andrej Kozemcak <andrej.kozemcak@pantheon.tech>
Diffstat (limited to 'src/cmake')
| -rw-r--r-- | src/cmake/FindVPP.cmake | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/cmake/FindVPP.cmake b/src/cmake/FindVPP.cmake index afc1520..56ab482 100644 --- a/src/cmake/FindVPP.cmake +++ b/src/cmake/FindVPP.cmake @@ -98,6 +98,15 @@ else (VPP_LIBRARIES AND VPP_INCLUDE_DIRS) ${CMAKE_INSTALL_PREFIX}/include ) + find_path(VOM_INCLUDE_DIR + NAMES + vom/om.hpp + PATHS + ${VPP_INCLUDE_PATH} + ${CMAKE_INCLUDE_PATH} + ${CMAKE_INSTALL_PREFIX}/include + ) + find_library(VLIBMEMORYCLIENT_LIBRARY NAMES vlibmemoryclient @@ -158,6 +167,16 @@ else (VPP_LIBRARIES AND VPP_INCLUDE_DIRS) ${CMAKE_INSTALL_PREFIX}/lib ) + find_library(VOM_LIBRARY + NAMES + vom + libvom + PATHS + ${VPP_LIBRARY_PATH} + ${CMAKE_LIBRARY_PATH} + ${CMAKE_INSTALL_PREFIX}/lib + ) + if (VPP_INCLUDE_DIR AND VPP_LIBRARY) set(VPP_FOUND TRUE) else (VPP_INCLUDE_DIR AND VPP_LIBRARY) @@ -171,6 +190,7 @@ else (VPP_LIBRARIES AND VPP_INCLUDE_DIRS) ${VPP_MSG_INCLUDE_DIR} ${VPP_ALL_INCLUDE_DIR} ${VAPI_INCLUDE_DIR} + ${VOM_INCLUDE_DIR} ) set(VPP_LIBRARIES @@ -180,6 +200,7 @@ else (VPP_LIBRARIES AND VPP_INCLUDE_DIRS) ${VLIB_LIBRARY} ${VATPLUGIN_LIBRARY} ${VAPI_LIBRARY} + ${VOM_LIBRARY} ) # show the VPP_INCLUDE_DIRS and VPP_LIBRARIES variables only in the advanced view |