GBP: l3-out subnets

[vpp.git] / src / vppinfra / CMakeLists.txt

diff --git a/src/vppinfra/CMakeLists.txt b/src/vppinfra/CMakeLists.txt
index f358339..4f0d16b 100644 (file)
--- a/src/vppinfra/CMakeLists.txt
+++ b/src/vppinfra/CMakeLists.txt
@@ -16,7 +16,7 @@ enable_language(ASM)
 ##############################################################################
 # Generate vppinfra/config.h
 ##############################################################################
-set(LOG2_CACHE_LINE_BYTES 6)
+set(LOG2_CACHE_LINE_BYTES ${VPP_LOG2_CACHE_LINE_SIZE})
 option(VPP_USE_DLMALLOC "Use dlmalloc memory allocator." ON)
 if(VPP_USE_DLMALLOC)
   set(DLMALLOC 1)
@@ -32,7 +32,7 @@ configure_file(
 install(
   FILES ${CMAKE_BINARY_DIR}/vppinfra/config.h
   DESTINATION include/vppinfra
-  COMPONENT dev
+  COMPONENT vpp-dev
 )
 
 ##############################################################################
@@ -44,7 +44,6 @@ set(VPPINFRA_SRCS
   cpu.c
   cuckoo_template.c
   elf.c
-  elf_clib.c
   elog.c
   error.c
   fheap.c
@@ -57,9 +56,10 @@ set(VPPINFRA_SRCS
   macros.c
   maplog.c
   mhash.c
+  pcap.c
+  pmalloc.c
   pool.c
   ptclosure.c
-  qsort.c
   random.c
   random_buffer.c
   random_isaac.c
@@ -84,8 +84,6 @@ set(VPPINFRA_SRCS
   vec.c
   vector.c
   zvec.c
-  linux/mem.c
-  linux/sysfs.c
 )
 
 set(VPPINFRA_HEADERS
@@ -138,8 +136,12 @@ set(VPPINFRA_HEADERS
   mheap_bootstrap.h
   mheap.h
   os.h
+  pcap.h
+  pcap_funcs.h
   pipeline.h
+  pmalloc.h
   pool.h
+  pmc.h
   ptclosure.h
   random_buffer.h
   random.h
@@ -162,6 +164,7 @@ set(VPPINFRA_HEADERS
   tw_timer_template.c
   tw_timer_template.h
   types.h
+  atomics.h
   unix.h
   valgrind.h
   valloc.h
@@ -181,6 +184,14 @@ set(VPPINFRA_HEADERS
   linux/sysfs.h
 )
 
+if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+  list(APPEND VPPINFRA_SRCS
+    elf_clib.c
+    linux/mem.c
+    linux/sysfs.c
+   )
+endif()
+
 
 if(VPP_USE_DLMALLOC)
   list(APPEND VPPINFRA_SRCS
@@ -198,6 +209,7 @@ add_vpp_library(vppinfra
   SOURCES ${VPPINFRA_SRCS}
   LINK_LIBRARIES m
   INSTALL_HEADERS ${VPPINFRA_HEADERS}
+  COMPONENT libvppinfra
 )
 
 ##############################################################################
@@ -220,6 +232,7 @@ if(VPP_BUILD_VPPINFRA_TESTS)
     longjmp
     macros
     maplog
+    pmalloc
     pool_iterate
     ptclosure
     random