wanderer/ fastnetmon-ng
1
1
Fork 0
Code Issues 2 Pull Requests Projects 1 Releases Activity

Fixed capnp compilation logic for FNM

This commit is contained in:
Pavel Odintsov 2020-10-24 19:02:55 +01:00
parent 3c2169a058
commit 27864d9b8c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/CMakeLists.txt
View File

@ -196,7 +196,6 @@ endif()
add_library(simple_packet_capnp STATIC simple_packet_capnp/simple_packet.capnp.c++)
target_link_libraries(simple_packet_capnp ${CAPNP_LIBRARY_PATH} ${CAPNP_KJ_LIBRARY_PATH})
target_link_libraries(fastnetmon simple_packet_capnp)
# Our LPM library
add_library(patricia STATIC libpatricia/patricia.c)
@ -206,6 +205,9 @@ add_library(fastnetmon_pcap_format STATIC fastnetmon_pcap_format.cpp)
# Our tools library
add_library(fast_library STATIC fast_library.cpp)
# Link it with cap'n'p stuff
target_link_libraries(fast_library simple_packet_capnp)
# Our parser
add_library(unified_parser STATIC unified_parser.cpp)
target_link_libraries(unified_parser fastnetmon_packet_parser)
@ -504,7 +506,7 @@ if (CAPNP_SUPPORT)
find_library(CAPNP_KJ_LIBRARY_PATH NAMES kj PATHS "${CAPNP_CUSTOM_INSTALL_PATH}/lib" NO_DEFAULT_PATH)
if (CAPNP_LIBRARY_PATH AND CAPNP_KJ_LIBRARY_PATH)
# All fine
message(STATUS "We found capnp and kj libraries: ${CAPNP_LIBRARY_PATH} ${CAPNP_KJ_LIBRARY_PATH}")
else()
message(FATAL_ERROR "Could not find capnp libraries")
endif()