X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2FCMakeLists.txt;h=60e6eeff9fea2c3ee298f56f94681cdaff32b154;hb=a690fdbfe179e0ea65818c03b52535bf9210efd0;hp=4f0d16bd568f4373b80b119f48b93c9874cfd335;hpb=3ae2873e568dd441a22903ab9f8c7954835b0bf1;p=vpp.git

diff --git a/src/vppinfra/CMakeLists.txt b/src/vppinfra/CMakeLists.txt
index 4f0d16bd568..60e6eeff9fe 100644
--- a/src/vppinfra/CMakeLists.txt
+++ b/src/vppinfra/CMakeLists.txt
@@ -24,6 +24,13 @@ else(VPP_USE_DLMALLOC)
   set(DLMALLOC 0)
 endif(VPP_USE_DLMALLOC)
 
+find_library(NUMA numa)
+if (NUMA)
+  set(NUMA_LIBRARY_FOUND 1)
+else(NUMA)
+  set(NUMA_LIBRARY_FOUND 0)
+endif()
+
 configure_file(
   ${CMAKE_SOURCE_DIR}/vppinfra/config.h.in
   ${CMAKE_BINARY_DIR}/vppinfra/config.h
@@ -39,8 +46,8 @@ install(
 # vppinfra sources
 ##############################################################################
 set(VPPINFRA_SRCS
-  asm_x86.c
   backtrace.c
+  bihash_all_vector.c
   cpu.c
   cuckoo_template.c
   elf.c
@@ -56,6 +63,7 @@ set(VPPINFRA_SRCS
   macros.c
   maplog.c
   mhash.c
+  mpcap.c
   pcap.c
   pmalloc.c
   pool.c
@@ -63,6 +71,7 @@ set(VPPINFRA_SRCS
   random.c
   random_buffer.c
   random_isaac.c
+  rbtree.c
   serialize.c
   slist.c
   socket.c
@@ -70,7 +79,6 @@ set(VPPINFRA_SRCS
   string.c
   time.c
   time_range.c
-  timer.c
   timing_wheel.c
   tw_timer_2t_1w_2048sl.c
   tw_timer_16t_2w_512sl.c
@@ -87,8 +95,7 @@ set(VPPINFRA_SRCS
 )
 
 set(VPPINFRA_HEADERS
-  asm_mips.h
-  asm_x86.h
+  sanitizer.h
   bihash_16_8.h
   bihash_24_8.h
   bihash_40_8.h
@@ -101,6 +108,7 @@ set(VPPINFRA_HEADERS
   bitops.h
   byte_order.h
   cache.h
+  callback.h
   clib_error.h
   clib.h
   cpu.h
@@ -123,6 +131,7 @@ set(VPPINFRA_HEADERS
   hash.h
   heap.h
   lb_hash_hash.h
+  llist.h
   lock.h
   longjmp.h
   macros.h
@@ -135,6 +144,7 @@ set(VPPINFRA_HEADERS
   mhash.h
   mheap_bootstrap.h
   mheap.h
+  mpcap.h
   os.h
   pcap.h
   pcap_funcs.h
@@ -146,7 +156,9 @@ set(VPPINFRA_HEADERS
   random_buffer.h
   random.h
   random_isaac.h
+  rbtree.h
   serialize.h
+  sha2.h
   slist.h
   smp.h
   socket.h
@@ -154,7 +166,6 @@ set(VPPINFRA_HEADERS
   string.h
   time.h
   time_range.h
-  timer.h
   timing_wheel.h
   tw_timer_16t_1w_2048sl.h
   tw_timer_16t_2w_512sl.h
@@ -166,7 +177,6 @@ set(VPPINFRA_HEADERS
   types.h
   atomics.h
   unix.h
-  valgrind.h
   valloc.h
   vec_bootstrap.h
   vec.h
@@ -207,7 +217,7 @@ endif(VPP_USE_DLMALLOC)
 
 add_vpp_library(vppinfra
   SOURCES ${VPPINFRA_SRCS}
-  LINK_LIBRARIES m
+  LINK_LIBRARIES m ${NUMA}
   INSTALL_HEADERS ${VPPINFRA_HEADERS}
   COMPONENT libvppinfra
 )
@@ -237,9 +247,11 @@ if(VPP_BUILD_VPPINFRA_TESTS)
     ptclosure
     random
     random_isaac
+    rwlock
     serialize
     slist
     socket
+    spinlock
     time
     time_range
     timing_wheel
@@ -250,7 +262,7 @@ if(VPP_BUILD_VPPINFRA_TESTS)
   )
     add_vpp_executable(test_${test}
       SOURCES test_${test}.c
-      LINK_LIBRARIES vppinfra
+      LINK_LIBRARIES vppinfra pthread
       )
   endforeach()