X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2FCMakeLists.txt;h=bb43abdc63e30bb490a9531b79e328842b413441;hb=c73984a0fcc8229e698c315524067e8aa3673b48;hp=1cecf5fb17d3cc4408816648e963201829efaebc;hpb=a638c18375f17891a9455e717d8436158af12387;p=vpp.git

diff --git a/src/vlib/CMakeLists.txt b/src/vlib/CMakeLists.txt
index 1cecf5fb17d..bb43abdc63e 100644
--- a/src/vlib/CMakeLists.txt
+++ b/src/vlib/CMakeLists.txt
@@ -11,17 +11,37 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+option(VPP_BUFFER_FAULT_INJECTOR "Include the buffer fault injector" OFF)
+
 ##############################################################################
 # Generate vlib/config.h
 ##############################################################################
+if(VPP_BUFFER_FAULT_INJECTOR)
+  set(BUFFER_ALLOC_FAULT_INJECTOR 1 CACHE STRING "fault injector on")
+else()
+  set(BUFFER_ALLOC_FAULT_INJECTOR 0 CACHE STRING "fault injector off")
+endif()
+
 set(PRE_DATA_SIZE 128 CACHE STRING "Buffer headroom size.")
+
+if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG")
+  set(_ss 16)
+else()
+  set(_ss 15)
+endif()
+set(VLIB_PROCESS_LOG2_STACK_SIZE
+ ${_ss}
+ CACHE
+ STRING "Process node default stack size (log2)"
+)
+
 configure_file(
   ${CMAKE_SOURCE_DIR}/vlib/config.h.in
-  ${CMAKE_BINARY_DIR}/vlib/config.h
+  ${CMAKE_CURRENT_BINARY_DIR}/config.h
 )
 install(
-  FILES ${CMAKE_BINARY_DIR}/vlib/config.h
-  DESTINATION include/vlib
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/vlib
   COMPONENT vpp-dev
 )
 
@@ -29,8 +49,8 @@ install(
 # Find lib and include files
 ##############################################################################
 message(STATUS "Looking for libuuid")
-find_path(UUID_INCLUDE_DIR NAMES uuid/uuid.h)
-find_library(UUID_LIB NAMES uuid)
+vpp_find_path(UUID_INCLUDE_DIR NAMES uuid/uuid.h)
+vpp_find_library(UUID_LIB NAMES uuid)
 
 if(UUID_INCLUDE_DIR AND UUID_LIB)
   include_directories(${UUID_INCLUDE_DIR})
@@ -47,13 +67,13 @@ endif()
 add_vpp_library(vlib
   SOURCES
   buffer.c
+  buffer_funcs.c
   cli.c
   counter.c
   drop.c
   error.c
   format.c
   handoff_trace.c
-  i2c.c
   init.c
   linux/pci.c
   linux/vfio.c
@@ -62,14 +82,22 @@ add_vpp_library(vlib
   node.c
   node_cli.c
   node_format.c
+  node_init.c
   pci/pci.c
+  pci/pci_types_api.c
   physmem.c
   punt.c
   punt_node.c
+  stats/cli.c
+  stats/collector.c
+  stats/format.c
+  stats/init.c
+  stats/provider_mem.c
+  stats/stats.c
   threads.c
   threads_cli.c
+  time.c
   trace.c
-  unix/cj.c
   unix/cli.c
   unix/input.c
   unix/main.c
@@ -79,14 +107,15 @@ add_vpp_library(vlib
   ${VMBUS_SOURCE}
 
   MULTIARCH_SOURCES
+  buffer_funcs.c
   drop.c
   punt_node.c
+  node_init.c
 
   INSTALL_HEADERS
   buffer_funcs.h
   buffer.h
   buffer_node.h
-  cli_funcs.h
   cli.h
   counter.h
   counter_types.h
@@ -95,7 +124,6 @@ add_vpp_library(vlib
   error.h
   format_funcs.h
   global_funcs.h
-  i2c.h
   init.h
   linux/vfio.h
   log.h
@@ -104,18 +132,26 @@ add_vpp_library(vlib
   node.h
   pci/pci_config.h
   pci/pci.h
+  pci/pci_types_api.h
   physmem_funcs.h
   physmem.h
   punt.h
+  stats/shared.h
+  stats/stats.h
   threads.h
+  time.h
   trace_funcs.h
   trace.h
-  unix/cj.h
   unix/mc_socket.h
   unix/plugin.h
   unix/unix.h
   vlib.h
   vmbus/vmbus.h
 
+  API_FILES
+  pci/pci_types.api
+
   LINK_LIBRARIES vppinfra svm ${VMBUS_LIBS} ${CMAKE_DL_LIBS}
+
+  DEPENDS api_headers
 )