Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
misc: experimental configure script
[vpp.git]
/
src
/
vppinfra
/
CMakeLists.txt
diff --git
a/src/vppinfra/CMakeLists.txt
b/src/vppinfra/CMakeLists.txt
index
3d54be2
..
dd3690b
100644
(file)
--- a/
src/vppinfra/CMakeLists.txt
+++ b/
src/vppinfra/CMakeLists.txt
@@
-27,20
+27,28
@@
endif(VPP_VECTOR_GROW_BY_ONE)
configure_file(
${CMAKE_SOURCE_DIR}/vppinfra/config.h.in
configure_file(
${CMAKE_SOURCE_DIR}/vppinfra/config.h.in
- ${CMAKE_
BINARY_DIR}/vppinfra
/config.h
+ ${CMAKE_
CURRENT_BINARY_DIR}
/config.h
)
install(
)
install(
- FILES ${CMAKE_
BINARY_DIR}/vppinfra
/config.h
+ FILES ${CMAKE_
CURRENT_BINARY_DIR}
/config.h
DESTINATION include/vppinfra
COMPONENT vpp-dev
)
DESTINATION include/vppinfra
COMPONENT vpp-dev
)
+add_definitions(-fvisibility=hidden)
+
+# Ensure symbols from cJSON are exported
+set_source_files_properties( cJSON.c PROPERTIES
+ COMPILE_DEFINITIONS " CJSON_API_VISIBILITY " )
+
+
##############################################################################
# vppinfra sources
##############################################################################
set(VPPINFRA_SRCS
backtrace.c
##############################################################################
# vppinfra sources
##############################################################################
set(VPPINFRA_SRCS
backtrace.c
+ bitmap.c
bihash_all_vector.c
cpu.c
dlmalloc.c
bihash_all_vector.c
cpu.c
dlmalloc.c
@@
-52,10
+60,12
@@
set(VPPINFRA_SRCS
graph.c
hash.c
heap.c
graph.c
hash.c
heap.c
+ interrupt.c
longjmp.S
macros.c
maplog.c
mem.c
longjmp.S
macros.c
maplog.c
mem.c
+ mem_bulk.c
mem_dlmalloc.c
mhash.c
mpcap.c
mem_dlmalloc.c
mhash.c
mpcap.c
@@
-86,15
+96,19
@@
set(VPPINFRA_SRCS
valloc.c
vec.c
vector.c
valloc.c
vec.c
vector.c
+ cJSON.c
)
set(VPPINFRA_HEADERS
sanitizer.h
bihash_16_8.h
bihash_24_8.h
)
set(VPPINFRA_HEADERS
sanitizer.h
bihash_16_8.h
bihash_24_8.h
+ bihash_32_8.h
bihash_40_8.h
bihash_48_8.h
bihash_8_8.h
bihash_40_8.h
bihash_48_8.h
bihash_8_8.h
+ bihash_8_16.h
+ bihash_24_16.h
bihash_template.c
bihash_template.h
bihash_vec8_8.h
bihash_template.c
bihash_template.h
bihash_vec8_8.h
@@
-104,6
+118,7
@@
set(VPPINFRA_HEADERS
cache.h
callback.h
callback_data.h
cache.h
callback.h
callback_data.h
+ cJSON.h
clib_error.h
clib.h
cpu.h
clib_error.h
clib.h
cpu.h
@@
-121,6
+136,7
@@
set(VPPINFRA_HEADERS
graph.h
hash.h
heap.h
graph.h
hash.h
heap.h
+ interrupt.h
lb_hash_hash.h
llist.h
lock.h
lb_hash_hash.h
llist.h
lock.h
@@
-128,6
+144,7
@@
set(VPPINFRA_HEADERS
macros.h
maplog.h
math.h
macros.h
maplog.h
math.h
+ memcpy.h
memcpy_avx2.h
memcpy_avx512.h
memcpy_sse3.h
memcpy_avx2.h
memcpy_avx512.h
memcpy_sse3.h
@@
-139,7
+156,6
@@
set(VPPINFRA_HEADERS
pcap_funcs.h
pmalloc.h
pool.h
pcap_funcs.h
pmalloc.h
pool.h
- pmc.h
ptclosure.h
random_buffer.h
random.h
ptclosure.h
random_buffer.h
random.h
@@
-177,7
+193,6
@@
set(VPPINFRA_HEADERS
vector_sse42.h
warnings.h
xxhash.h
vector_sse42.h
warnings.h
xxhash.h
- linux/syscall.h
linux/sysfs.h
)
linux/sysfs.h
)
@@
-189,11
+204,16
@@
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
)
endif()
)
endif()
+option(VPP_USE_EXTERNAL_LIBEXECINFO "Use external libexecinfo (useful for non-glibc targets)." OFF)
+if(VPP_USE_EXTERNAL_LIBEXECINFO)
+ set(EXECINFO_LIB execinfo)
+endif()
add_vpp_library(vppinfra
SOURCES ${VPPINFRA_SRCS}
add_vpp_library(vppinfra
SOURCES ${VPPINFRA_SRCS}
- LINK_LIBRARIES m
+ LINK_LIBRARIES m
${EXECINFO_LIB}
INSTALL_HEADERS ${VPPINFRA_HEADERS}
COMPONENT libvppinfra
INSTALL_HEADERS ${VPPINFRA_HEADERS}
COMPONENT libvppinfra
+ LTO
)
##############################################################################
)
##############################################################################