CMakeLists.txt (snort3-3.1.29.0) | : | CMakeLists.txt (snort3-3.1.30.0) | ||
---|---|---|---|---|
skipping to change at line 36 | skipping to change at line 36 | |||
) | ) | |||
if ( ENABLE_STATIC_DAQ ) | if ( ENABLE_STATIC_DAQ ) | |||
LIST(APPEND EXTERNAL_LIBRARIES ${DAQ_STATIC_MODULE_LIBS}) | LIST(APPEND EXTERNAL_LIBRARIES ${DAQ_STATIC_MODULE_LIBS}) | |||
endif () | endif () | |||
if ( HAVE_ATOMIC ) | if ( HAVE_ATOMIC ) | |||
LIST(APPEND EXTERNAL_LIBRARIES ${ATOMIC_LIBRARIES}) | LIST(APPEND EXTERNAL_LIBRARIES ${ATOMIC_LIBRARIES}) | |||
endif() | endif() | |||
if ( HAVE_FLATBUFFERS ) | ||||
LIST(APPEND EXTERNAL_LIBRARIES ${FLATBUFFERS_LIBRARIES}) | ||||
endif() | ||||
if ( HAVE_HYPERSCAN ) | if ( HAVE_HYPERSCAN ) | |||
LIST(APPEND EXTERNAL_LIBRARIES ${HS_LIBRARIES}) | LIST(APPEND EXTERNAL_LIBRARIES ${HS_LIBRARIES}) | |||
LIST(APPEND EXTERNAL_INCLUDES ${HS_INCLUDE_DIRS}) | LIST(APPEND EXTERNAL_INCLUDES ${HS_INCLUDE_DIRS}) | |||
endif () | endif () | |||
if ( HAVE_ICONV ) | if ( HAVE_ICONV ) | |||
LIST(APPEND EXTERNAL_LIBRARIES ${ICONV_LIBRARY}) | LIST(APPEND EXTERNAL_LIBRARIES ${ICONV_LIBRARY}) | |||
LIST(APPEND EXTERNAL_INCLUDES ${ICONV_INCLUDE_DIR}) | LIST(APPEND EXTERNAL_INCLUDES ${ICONV_INCLUDE_DIR}) | |||
endif () | endif () | |||
skipping to change at line 90 | skipping to change at line 86 | |||
if ( ENABLE_UNIT_TESTS ) | if ( ENABLE_UNIT_TESTS ) | |||
enable_testing() | enable_testing() | |||
endif ( ENABLE_UNIT_TESTS ) | endif ( ENABLE_UNIT_TESTS ) | |||
if ( ENABLE_UNIT_TESTS OR ENABLE_BENCHMARK_TESTS ) | if ( ENABLE_UNIT_TESTS OR ENABLE_BENCHMARK_TESTS ) | |||
set( UNIT_TESTS_LIBRARIES $<TARGET_OBJECTS:catch_tests>) | set( UNIT_TESTS_LIBRARIES $<TARGET_OBJECTS:catch_tests>) | |||
add_subdirectory(catch) | add_subdirectory(catch) | |||
endif ( ENABLE_UNIT_TESTS OR ENABLE_BENCHMARK_TESTS ) | endif ( ENABLE_UNIT_TESTS OR ENABLE_BENCHMARK_TESTS ) | |||
if ( ENABLE_PIGLET ) | ||||
set ( PIGLET_LIBRARIES $<TARGET_OBJECTS:piglet> $<TARGET_OBJECTS:piglet_plug | ||||
ins> ) | ||||
add_subdirectory ( piglet ) | ||||
add_subdirectory ( piglet_plugins ) | ||||
endif ( ENABLE_PIGLET ) | ||||
add_subdirectory(actions) | add_subdirectory(actions) | |||
add_subdirectory(codecs) | add_subdirectory(codecs) | |||
add_subdirectory(control) | add_subdirectory(control) | |||
add_subdirectory(detection) | add_subdirectory(detection) | |||
add_subdirectory(dump_config) | add_subdirectory(dump_config) | |||
add_subdirectory(events) | add_subdirectory(events) | |||
add_subdirectory(file_api) | add_subdirectory(file_api) | |||
add_subdirectory(filters) | add_subdirectory(filters) | |||
add_subdirectory(flow) | add_subdirectory(flow) | |||
add_subdirectory(framework) | add_subdirectory(framework) | |||
skipping to change at line 199 | skipping to change at line 189 | |||
$<TARGET_OBJECTS:stream_tcp> | $<TARGET_OBJECTS:stream_tcp> | |||
$<TARGET_OBJECTS:stream_udp> | $<TARGET_OBJECTS:stream_udp> | |||
$<TARGET_OBJECTS:stream_user> | $<TARGET_OBJECTS:stream_user> | |||
$<TARGET_OBJECTS:stream_file> | $<TARGET_OBJECTS:stream_file> | |||
$<TARGET_OBJECTS:stream_paf> | $<TARGET_OBJECTS:stream_paf> | |||
$<TARGET_OBJECTS:target_based> | $<TARGET_OBJECTS:target_based> | |||
$<TARGET_OBJECTS:tcp_connector> | $<TARGET_OBJECTS:tcp_connector> | |||
$<TARGET_OBJECTS:time> | $<TARGET_OBJECTS:time> | |||
$<TARGET_OBJECTS:trace> | $<TARGET_OBJECTS:trace> | |||
$<TARGET_OBJECTS:utils> | $<TARGET_OBJECTS:utils> | |||
${PIGLET_LIBRARIES} | ||||
${STATIC_CODEC_PLUGINS} | ${STATIC_CODEC_PLUGINS} | |||
${STATIC_NETWORK_INSPECTOR_PLUGINS} | ${STATIC_NETWORK_INSPECTOR_PLUGINS} | |||
${STATIC_SERVICE_INSPECTOR_PLUGINS} | ${STATIC_SERVICE_INSPECTOR_PLUGINS} | |||
${STATIC_POLICY_SELECTOR_PLUGINS} | ${STATIC_POLICY_SELECTOR_PLUGINS} | |||
${UNIT_TESTS_LIBRARIES} | ${UNIT_TESTS_LIBRARIES} | |||
) | ) | |||
#[[ | #[[ | |||
message(" | message(" | |||
STATIC_CODEC_PLUGINS = ${STATIC_CODEC_PLUGINS} | STATIC_CODEC_PLUGINS = ${STATIC_CODEC_PLUGINS} | |||
End of changes. 3 change blocks. | ||||
12 lines changed or deleted | 0 lines changed or added |