X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fcmake%2FVPPConfig.cmake;h=6f1b530625afdecc3e492bf40b0fa15d34d6d4c3;hb=b10561bbecb2870360a731b4696bff920150720d;hp=c6fd9fa3dedb903511d513aadd2b64cb4efc493e;hpb=eeadc14ee2c945eb53ae4cc3c6262499e896afb5;p=vpp.git

diff --git a/src/cmake/VPPConfig.cmake b/src/cmake/VPPConfig.cmake
index c6fd9fa3ded..6f1b530625a 100644
--- a/src/cmake/VPPConfig.cmake
+++ b/src/cmake/VPPConfig.cmake
@@ -15,9 +15,12 @@ get_filename_component(CMAKE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
 
 find_path(VPP_INCLUDE_DIR PATH_SUFFIXES NAMES vppinfra/clib.h)
 find_program(VPP_APIGEN vppapigen)
+find_program(VPP_VAPI_C_GEN vapi_c_gen.py)
+find_program(VPP_VAPI_CPP_GEN vapi_cpp_gen.py)
 
 if(VPP_INCLUDE_DIR AND VPP_APIGEN)
   include_directories (${VPP_INCLUDE_DIR})
+  include_directories (${VPP_INCLUDE_DIR}/vpp_plugins)
 else()
   message(FATAL_ERROR "VPP headers, libraries and/or tools not found")
 endif()
@@ -31,7 +34,10 @@ if (compiler_flag_no_address_of_packed_member)
   add_definitions(-Wno-address-of-packed-member)
 endif()
 
-include(CheckCCompilerFlag)
+set(VPP_RUNTIME_DIR "bin" CACHE STRING "Relative runtime directory path")
+set(VPP_LIBRARY_DIR "lib" CACHE STRING "Relative library directory path")
+set(VPP_BINARY_DIR ${CMAKE_BINARY_DIR}/CMakeFiles)
+
 include(${CMAKE_CURRENT_LIST_DIR}/cpu.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/api.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/library.cmake)