From: Joel Cornett Date: Fri, 6 May 2016 17:01:45 +0000 (-0400) Subject: more updates X-Git-Tag: 3.0.0-233~405^2~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cf7e51ba9e717d52fc52db26331bce26235fd942;p=thirdparty%2Fsnort3.git more updates --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 3241abdf1..ddff1b9ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,12 +40,12 @@ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") include_directories (${PROJECT_BINARY_DIR}) include_directories (${PROJECT_SOURCE_DIR}) -if (BUILD_UNIT_TESTS) +if (ENABLE_UNIT_TESTS) pkg_check_modules (CPPUTEST REQUIRED cpputest) add_custom_target (check COMMAND ${CMAKE_CTEST_COMMAND}) add_dependencies (check snort) add_test (catch_tests ${CMAKE_CURRENT_BINARY_DIR}/src/snort --catch-test all) -endif (BUILD_UNIT_TESTS) +endif (ENABLE_UNIT_TESTS) add_subdirectory (src) add_subdirectory (tools) diff --git a/cmake/configure_options.cmake b/cmake/configure_options.cmake index adddec695..02352fa5f 100644 --- a/cmake/configure_options.cmake +++ b/cmake/configure_options.cmake @@ -4,8 +4,8 @@ # features set ( SHELL ${ENABLE_SHELL} ) -set ( SIDE_CHANNEL ${BUILD_SIDE_CHANNEL} ) -set ( UNIT_TEST ${BUILD_UNIT_TESTS} ) +set ( SIDE_CHANNEL ${ENABLE_SIDE_CHANNEL} ) +set ( UNIT_TEST ${ENABLE_UNIT_TESTS} ) set ( PIGLET ${ENABLE_PIGLET} ) if ( NOT ENABLE_COREFILES ) diff --git a/cmake/create_options.cmake b/cmake/create_options.cmake index 6cfee9ad1..c21e637f2 100644 --- a/cmake/create_options.cmake +++ b/cmake/create_options.cmake @@ -16,8 +16,8 @@ option ( ENABLE_STATIC_DAQ "link static DAQ modules" ON ) # features option ( ENABLE_SHELL "enable shell support" OFF ) -option ( BUILD_SIDE_CHANNEL "Build the side channel library" OFF ) -option ( BUILD_UNIT_TESTS "Build Snort++ unit tests" OFF ) +option ( ENABLE_SIDE_CHANNEL "enable the side channel library" OFF ) +option ( ENABLE_UNIT_TESTS "enable unit tests" OFF ) option ( ENABLE_PIGLET "enable piglet test harness" OFF ) option ( ENABLE_PTHREAD "enable pthread support" ON ) diff --git a/cmake/macros.cmake b/cmake/macros.cmake index a5d260bf3..4d4b793b3 100644 --- a/cmake/macros.cmake +++ b/cmake/macros.cmake @@ -56,7 +56,7 @@ macro (add_shared_library libname install_path) install (TARGETS ${libname} LIBRARY DESTINATION "lib/${CMAKE_PROJECT_NAME}/${install_path}" ) - + else (${num_extra_args} GREATER 0) message (STATUS "add_static_library requires at least one source file!") @@ -127,7 +127,7 @@ macro (append_to_cache_variable cache_var) get_property(cache_value CACHE ${cache_var} PROPERTY VALUE) get_property(cache_type CACHE ${cache_var} PROPERTY TYPE) get_property(cache_help_string CACHE ${cache_var} PROPERTY HELPSTRING) - + set (tmp ${cache_value} ${ARGN}) set(${cache_var} "${tmp}" CACHE ${cache_type} " ${cache_help_string}") @@ -138,11 +138,11 @@ endmacro () #anything following testname is assumed to be a link dependency macro (add_cpputest testname) - if (BUILD_UNIT_TESTS) + if ( ENABLE_UNIT_TESTS ) add_executable (${testname} EXCLUDE_FROM_ALL ${testname}.cc) target_include_directories (${testname} PRIVATE ${CPPUTEST_INCLUDE_DIRS}) target_link_libraries (${testname} ${CPPUTEST_LIBRARIES} ${ARGN}) add_test (${testname} ${testname}) add_dependencies ( check ${testname} ) - endif (BUILD_UNIT_TESTS) + endif ( ENABLE_UNIT_TESTS ) endmacro (add_cpputest) diff --git a/configure.ac b/configure.ac index 0e50d1049..43f172aeb 100644 --- a/configure.ac +++ b/configure.ac @@ -57,7 +57,7 @@ fi CFLAGS="-std=gnu99 $CFLAGS" -AX_CXX_COMPILE_STDCXX_11 +AX_CXX_COMPILE_STDCXX_11([noext], [mandatory]) LT_INIT @@ -520,7 +520,7 @@ if test "x$enable_unit_tests" = "xyes"; then AC_DEFINE(UNIT_TEST, [1], [enable unit tests in build]) fi -AM_CONDITIONAL(BUILD_UNIT_TESTS, test "x$enable_unit_tests" = "xyes") +AM_CONDITIONAL(ENABLE_UNIT_TESTS, test "x$enable_unit_tests" = "xyes") AM_CONDITIONAL(BUILD_CPPUTESTS, test "x$have_cpputest_pc" = "xyes") #-------------------------------------------------------------------------- diff --git a/configure_cmake.sh b/configure_cmake.sh index 779f12654..e66ca295a 100755 --- a/configure_cmake.sh +++ b/configure_cmake.sh @@ -236,10 +236,10 @@ while [ $# -ne 0 ]; do append_cache_entry ENABLE_SHELL BOOL false ;; --disable-unit-tests) - append_cache_entry BUILD_UNIT_TESTS BOOL false + append_cache_entry ENABLE_UNIT_TESTS BOOL false ;; --enable-unit-tests) - append_cache_entry BUILD_UNIT_TESTS BOOL true + append_cache_entry ENABLE_UNIT_TESTS BOOL true ;; --disable-piglet) append_cache_entry ENABLE_PIGLET BOOL false diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt index db9e1ecce..492cee1fb 100644 --- a/extra/CMakeLists.txt +++ b/extra/CMakeLists.txt @@ -25,3 +25,10 @@ set (CPACK_SOURCE_GENERATOR TGZ) include(CPack) +# hacks for the DAQ +execute_process ( + COMMAND pkg-config --variable=daq_cppflags snort + OUTPUT_VARIABLE DAQ_CPPFLAGS +) + +string ( REGEX REPLACE "[\r\n]" " " DAQ_CPPFLAGS "${DAQ_CPPFLAGS}" ) diff --git a/extra/src/codecs/cd_eapol/CMakeLists.txt b/extra/src/codecs/cd_eapol/CMakeLists.txt index 852252654..9eb61a765 100644 --- a/extra/src/codecs/cd_eapol/CMakeLists.txt +++ b/extra/src/codecs/cd_eapol/CMakeLists.txt @@ -17,13 +17,10 @@ add_library ( cd_eapol.cc ) -execute_process( - COMMAND pkg-config --variable=daq_cppflags snort - OUTPUT_VARIABLE DAQ_CPPFLAGS -) - -string(REGEX REPLACE "[\r\n]" " " DAQ_CPPFLAGS "${DAQ_CPPFLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${DAQ_CPPFLAGS}") +set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) +if ( DAQ_CPPFLAGS ) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DAQ_CPPFLAGS}" ) +endif ( DAQ_CPPFLAGS ) target_include_directories ( cd_eapol PUBLIC diff --git a/extra/src/codecs/cd_i4l_rawip/CMakeLists.txt b/extra/src/codecs/cd_i4l_rawip/CMakeLists.txt index b32844f0a..8b63255ee 100644 --- a/extra/src/codecs/cd_i4l_rawip/CMakeLists.txt +++ b/extra/src/codecs/cd_i4l_rawip/CMakeLists.txt @@ -17,13 +17,10 @@ add_library ( cd_i4l_rawip.cc ) -execute_process( - COMMAND pkg-config --variable=daq_cppflags snort - OUTPUT_VARIABLE DAQ_CPPFLAGS -) - -string(REGEX REPLACE "[\r\n]" " " DAQ_CPPFLAGS "${DAQ_CPPFLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${DAQ_CPPFLAGS}") +set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) +if ( DAQ_CPPFLAGS ) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DAQ_CPPFLAGS}" ) +endif ( DAQ_CPPFLAGS ) target_include_directories ( cd_i4l_rawip PUBLIC diff --git a/extra/src/codecs/cd_linux_sll/CMakeLists.txt b/extra/src/codecs/cd_linux_sll/CMakeLists.txt index ab389eba3..6d0c59d5f 100644 --- a/extra/src/codecs/cd_linux_sll/CMakeLists.txt +++ b/extra/src/codecs/cd_linux_sll/CMakeLists.txt @@ -17,13 +17,10 @@ add_library ( cd_linux_sll.cc ) -execute_process( - COMMAND pkg-config --variable=daq_cppflags snort - OUTPUT_VARIABLE DAQ_CPPFLAGS -) - -string(REGEX REPLACE "[\r\n]" " " DAQ_CPPFLAGS "${DAQ_CPPFLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${DAQ_CPPFLAGS}") +set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) +if ( DAQ_CPPFLAGS ) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DAQ_CPPFLAGS}" ) +endif ( DAQ_CPPFLAGS ) target_include_directories ( cd_linux_sll PUBLIC diff --git a/extra/src/codecs/cd_null/CMakeLists.txt b/extra/src/codecs/cd_null/CMakeLists.txt index 2b7163801..f5362c66e 100644 --- a/extra/src/codecs/cd_null/CMakeLists.txt +++ b/extra/src/codecs/cd_null/CMakeLists.txt @@ -17,13 +17,10 @@ add_library ( cd_null.cc ) -execute_process( - COMMAND pkg-config --variable=daq_cppflags snort - OUTPUT_VARIABLE DAQ_CPPFLAGS -) - -string(REGEX REPLACE "[\r\n]" " " DAQ_CPPFLAGS "${DAQ_CPPFLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${DAQ_CPPFLAGS}") +set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) +if ( DAQ_CPPFLAGS ) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DAQ_CPPFLAGS}" ) +endif ( DAQ_CPPFLAGS ) target_include_directories ( cd_null PUBLIC diff --git a/extra/src/codecs/cd_pflog/CMakeLists.txt b/extra/src/codecs/cd_pflog/CMakeLists.txt index eeef35b21..28a4a51db 100644 --- a/extra/src/codecs/cd_pflog/CMakeLists.txt +++ b/extra/src/codecs/cd_pflog/CMakeLists.txt @@ -17,13 +17,10 @@ add_library ( cd_pflog.cc ) -execute_process( - COMMAND pkg-config --variable=daq_cppflags snort - OUTPUT_VARIABLE DAQ_CPPFLAGS -) - -string(REGEX REPLACE "[\r\n]" " " DAQ_CPPFLAGS "${DAQ_CPPFLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${DAQ_CPPFLAGS}") +set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) +if ( DAQ_CPPFLAGS ) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DAQ_CPPFLAGS}" ) +endif ( DAQ_CPPFLAGS ) target_include_directories ( cd_pflog PUBLIC diff --git a/extra/src/codecs/cd_pim/CMakeLists.txt b/extra/src/codecs/cd_pim/CMakeLists.txt index 61b096d1f..b4baab7bf 100644 --- a/extra/src/codecs/cd_pim/CMakeLists.txt +++ b/extra/src/codecs/cd_pim/CMakeLists.txt @@ -17,13 +17,10 @@ add_library ( cd_pim.cc ) -execute_process( - COMMAND pkg-config --variable=daq_cppflags snort - OUTPUT_VARIABLE DAQ_CPPFLAGS -) - -string(REGEX REPLACE "[\r\n]" " " DAQ_CPPFLAGS "${DAQ_CPPFLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${DAQ_CPPFLAGS}") +set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) +if ( DAQ_CPPFLAGS ) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DAQ_CPPFLAGS}" ) +endif ( DAQ_CPPFLAGS ) target_include_directories ( cd_pim PUBLIC diff --git a/extra/src/codecs/cd_ppp/CMakeLists.txt b/extra/src/codecs/cd_ppp/CMakeLists.txt index c57872696..5621f4b05 100644 --- a/extra/src/codecs/cd_ppp/CMakeLists.txt +++ b/extra/src/codecs/cd_ppp/CMakeLists.txt @@ -17,13 +17,10 @@ add_library ( cd_ppp.cc ) -execute_process( - COMMAND pkg-config --variable=daq_cppflags snort - OUTPUT_VARIABLE DAQ_CPPFLAGS -) - -string(REGEX REPLACE "[\r\n]" " " DAQ_CPPFLAGS "${DAQ_CPPFLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${DAQ_CPPFLAGS}") +set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) +if ( DAQ_CPPFLAGS ) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DAQ_CPPFLAGS}" ) +endif ( DAQ_CPPFLAGS ) target_include_directories ( cd_ppp PUBLIC diff --git a/extra/src/codecs/cd_raw4/CMakeLists.txt b/extra/src/codecs/cd_raw4/CMakeLists.txt index 1abc81f5c..6daa00f7c 100644 --- a/extra/src/codecs/cd_raw4/CMakeLists.txt +++ b/extra/src/codecs/cd_raw4/CMakeLists.txt @@ -17,13 +17,10 @@ add_library ( cd_raw4.cc ) -execute_process( - COMMAND pkg-config --variable=daq_cppflags snort - OUTPUT_VARIABLE DAQ_CPPFLAGS -) - -string(REGEX REPLACE "[\r\n]" " " DAQ_CPPFLAGS "${DAQ_CPPFLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${DAQ_CPPFLAGS}") +set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) +if ( DAQ_CPPFLAGS ) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DAQ_CPPFLAGS}" ) +endif ( DAQ_CPPFLAGS ) target_include_directories ( cd_raw4 PUBLIC diff --git a/extra/src/codecs/cd_raw6/CMakeLists.txt b/extra/src/codecs/cd_raw6/CMakeLists.txt index ddcf515e1..a6171c182 100644 --- a/extra/src/codecs/cd_raw6/CMakeLists.txt +++ b/extra/src/codecs/cd_raw6/CMakeLists.txt @@ -17,13 +17,10 @@ add_library ( cd_raw6.cc ) -execute_process( - COMMAND pkg-config --variable=daq_cppflags snort - OUTPUT_VARIABLE DAQ_CPPFLAGS -) - -string(REGEX REPLACE "[\r\n]" " " DAQ_CPPFLAGS "${DAQ_CPPFLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${DAQ_CPPFLAGS}") +set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) +if ( DAQ_CPPFLAGS ) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DAQ_CPPFLAGS}" ) +endif ( DAQ_CPPFLAGS ) target_include_directories ( cd_raw6 PUBLIC diff --git a/extra/src/codecs/cd_slip/CMakeLists.txt b/extra/src/codecs/cd_slip/CMakeLists.txt index fe1c500b3..d1b9afa50 100644 --- a/extra/src/codecs/cd_slip/CMakeLists.txt +++ b/extra/src/codecs/cd_slip/CMakeLists.txt @@ -17,13 +17,10 @@ add_library ( cd_slip.cc ) -execute_process( - COMMAND pkg-config --variable=daq_cppflags snort - OUTPUT_VARIABLE DAQ_CPPFLAGS -) - -string(REGEX REPLACE "[\r\n]" " " DAQ_CPPFLAGS "${DAQ_CPPFLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${DAQ_CPPFLAGS}") +set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) +if ( DAQ_CPPFLAGS ) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DAQ_CPPFLAGS}" ) +endif ( DAQ_CPPFLAGS ) target_include_directories ( cd_slip PUBLIC diff --git a/extra/src/codecs/cd_token_ring/CMakeLists.txt b/extra/src/codecs/cd_token_ring/CMakeLists.txt index 355bda715..2aacecaaf 100644 --- a/extra/src/codecs/cd_token_ring/CMakeLists.txt +++ b/extra/src/codecs/cd_token_ring/CMakeLists.txt @@ -17,13 +17,10 @@ add_library ( cd_token_ring.cc ) -execute_process( - COMMAND pkg-config --variable=daq_cppflags snort - OUTPUT_VARIABLE DAQ_CPPFLAGS -) - -string(REGEX REPLACE "[\r\n]" " " DAQ_CPPFLAGS "${DAQ_CPPFLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${DAQ_CPPFLAGS}") +set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) +if ( DAQ_CPPFLAGS ) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DAQ_CPPFLAGS}" ) +endif ( DAQ_CPPFLAGS ) target_include_directories ( cd_token_ring PUBLIC diff --git a/extra/src/codecs/cd_wlan/CMakeLists.txt b/extra/src/codecs/cd_wlan/CMakeLists.txt index 5b8a31e4c..1c4ffc94d 100644 --- a/extra/src/codecs/cd_wlan/CMakeLists.txt +++ b/extra/src/codecs/cd_wlan/CMakeLists.txt @@ -17,13 +17,10 @@ add_library ( cd_wlan.cc ) -execute_process( - COMMAND pkg-config --variable=daq_cppflags snort - OUTPUT_VARIABLE DAQ_CPPFLAGS -) - -string(REGEX REPLACE "[\r\n]" " " DAQ_CPPFLAGS "${DAQ_CPPFLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${DAQ_CPPFLAGS}") +set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) +if ( DAQ_CPPFLAGS ) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DAQ_CPPFLAGS}" ) +endif ( DAQ_CPPFLAGS ) target_include_directories ( cd_wlan PUBLIC diff --git a/extra/src/daqs/daq_socket/CMakeLists.txt b/extra/src/daqs/daq_socket/CMakeLists.txt index 3a7fcddd7..c15ff502a 100644 --- a/extra/src/daqs/daq_socket/CMakeLists.txt +++ b/extra/src/daqs/daq_socket/CMakeLists.txt @@ -17,13 +17,10 @@ add_library ( daq_socket.c ) -execute_process( - COMMAND pkg-config --variable=daq_cppflags snort - OUTPUT_VARIABLE DAQ_CPPFLAGS -) - -string(REGEX REPLACE "[\r\n]" " " DAQ_CPPFLAGS "${DAQ_CPPFLAGS}") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 ${DAQ_CPPFLAGS}") +set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99" ) +if ( DAQ_CPPFLAGS ) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DAQ_CPPFLAGS}" ) +endif ( DAQ_CPPFLAGS ) target_include_directories ( daq_socket PUBLIC diff --git a/extra/src/inspectors/data_log/CMakeLists.txt b/extra/src/inspectors/data_log/CMakeLists.txt index 6b45aa15b..99acf674e 100644 --- a/extra/src/inspectors/data_log/CMakeLists.txt +++ b/extra/src/inspectors/data_log/CMakeLists.txt @@ -17,13 +17,10 @@ add_library ( data_log.cc ) -execute_process( - COMMAND pkg-config --variable=daq_cppflags snort - OUTPUT_VARIABLE DAQ_CPPFLAGS -) - -string(REGEX REPLACE "[\r\n]" " " DAQ_CPPFLAGS "${DAQ_CPPFLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${DAQ_CPPFLAGS}") +set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) +if ( DAQ_CPPFLAGS ) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DAQ_CPPFLAGS}" ) +endif ( DAQ_CPPFLAGS ) target_include_directories ( data_log PUBLIC diff --git a/extra/src/inspectors/dpx/CMakeLists.txt b/extra/src/inspectors/dpx/CMakeLists.txt index d7981e5f8..fd6b4d42b 100644 --- a/extra/src/inspectors/dpx/CMakeLists.txt +++ b/extra/src/inspectors/dpx/CMakeLists.txt @@ -17,13 +17,10 @@ add_library ( dpx.cc ) -execute_process( - COMMAND pkg-config --variable=daq_cppflags snort - OUTPUT_VARIABLE DAQ_CPPFLAGS -) - -string(REGEX REPLACE "[\r\n]" " " DAQ_CPPFLAGS "${DAQ_CPPFLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${DAQ_CPPFLAGS}") +set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) +if ( DAQ_CPPFLAGS ) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DAQ_CPPFLAGS}" ) +endif ( DAQ_CPPFLAGS ) target_include_directories ( dpx PUBLIC diff --git a/extra/src/ips_options/ips_pkt_num/CMakeLists.txt b/extra/src/ips_options/ips_pkt_num/CMakeLists.txt index 81a7415ed..908f1090b 100644 --- a/extra/src/ips_options/ips_pkt_num/CMakeLists.txt +++ b/extra/src/ips_options/ips_pkt_num/CMakeLists.txt @@ -17,13 +17,10 @@ add_library ( ips_pkt_num.cc ) -execute_process( - COMMAND pkg-config --variable=daq_cppflags snort - OUTPUT_VARIABLE DAQ_CPPFLAGS -) - -string(REGEX REPLACE "[\r\n]" " " DAQ_CPPFLAGS "${DAQ_CPPFLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${DAQ_CPPFLAGS}") +set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) +if ( DAQ_CPPFLAGS ) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DAQ_CPPFLAGS}" ) +endif ( DAQ_CPPFLAGS ) target_include_directories ( ips_pkt_num PUBLIC diff --git a/extra/src/ips_options/ips_urg/CMakeLists.txt b/extra/src/ips_options/ips_urg/CMakeLists.txt index a5b6f4b14..eaf3a5cd6 100644 --- a/extra/src/ips_options/ips_urg/CMakeLists.txt +++ b/extra/src/ips_options/ips_urg/CMakeLists.txt @@ -17,13 +17,10 @@ add_library ( ips_urg.cc ) -execute_process( - COMMAND pkg-config --variable=daq_cppflags snort - OUTPUT_VARIABLE DAQ_CPPFLAGS -) - -string(REGEX REPLACE "[\r\n]" " " DAQ_CPPFLAGS "${DAQ_CPPFLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${DAQ_CPPFLAGS}") +set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) +if ( DAQ_CPPFLAGS ) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DAQ_CPPFLAGS}" ) +endif ( DAQ_CPPFLAGS ) target_include_directories ( ips_urg PUBLIC diff --git a/extra/src/loggers/alert_ex/CMakeLists.txt b/extra/src/loggers/alert_ex/CMakeLists.txt index 3fadaae80..be09f451f 100644 --- a/extra/src/loggers/alert_ex/CMakeLists.txt +++ b/extra/src/loggers/alert_ex/CMakeLists.txt @@ -17,13 +17,10 @@ add_library ( alert_ex.cc ) -execute_process( - COMMAND pkg-config --variable=daq_cppflags snort - OUTPUT_VARIABLE DAQ_CPPFLAGS -) - -string(REGEX REPLACE "[\r\n]" " " DAQ_CPPFLAGS "${DAQ_CPPFLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${DAQ_CPPFLAGS}") +set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) +if ( DAQ_CPPFLAGS ) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DAQ_CPPFLAGS}" ) +endif ( DAQ_CPPFLAGS ) target_include_directories ( alert_ex PUBLIC diff --git a/extra/src/loggers/alert_unixsock/CMakeLists.txt b/extra/src/loggers/alert_unixsock/CMakeLists.txt index 900f823a4..c2455c034 100644 --- a/extra/src/loggers/alert_unixsock/CMakeLists.txt +++ b/extra/src/loggers/alert_unixsock/CMakeLists.txt @@ -17,13 +17,10 @@ add_library ( alert_unixsock.cc ) -execute_process( - COMMAND pkg-config --variable=daq_cppflags snort - OUTPUT_VARIABLE DAQ_CPPFLAGS -) - -string(REGEX REPLACE "[\r\n]" " " DAQ_CPPFLAGS "${DAQ_CPPFLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${DAQ_CPPFLAGS}") +set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) +if ( DAQ_CPPFLAGS ) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DAQ_CPPFLAGS}" ) +endif ( DAQ_CPPFLAGS ) target_include_directories ( alert_unixsock PUBLIC diff --git a/extra/src/loggers/log_null/CMakeLists.txt b/extra/src/loggers/log_null/CMakeLists.txt index 45aa1e7ad..a74645fd0 100644 --- a/extra/src/loggers/log_null/CMakeLists.txt +++ b/extra/src/loggers/log_null/CMakeLists.txt @@ -17,13 +17,10 @@ add_library ( log_null.cc ) -execute_process( - COMMAND pkg-config --variable=daq_cppflags snort - OUTPUT_VARIABLE DAQ_CPPFLAGS -) - -string(REGEX REPLACE "[\r\n]" " " DAQ_CPPFLAGS "${DAQ_CPPFLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${DAQ_CPPFLAGS}") +set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) +if ( DAQ_CPPFLAGS ) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DAQ_CPPFLAGS}" ) +endif ( DAQ_CPPFLAGS ) target_include_directories ( log_null PUBLIC diff --git a/extra/src/search_engines/lowmem/CMakeLists.txt b/extra/src/search_engines/lowmem/CMakeLists.txt index e70c01e0e..d157bc253 100644 --- a/extra/src/search_engines/lowmem/CMakeLists.txt +++ b/extra/src/search_engines/lowmem/CMakeLists.txt @@ -20,13 +20,10 @@ add_library ( trie_api.cc ) -execute_process( - COMMAND pkg-config --variable=daq_cppflags snort - OUTPUT_VARIABLE DAQ_CPPFLAGS -) - -string(REGEX REPLACE "[\r\n]" " " DAQ_CPPFLAGS "${DAQ_CPPFLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${DAQ_CPPFLAGS}") +set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) +if ( DAQ_CPPFLAGS ) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DAQ_CPPFLAGS}" ) +endif ( DAQ_CPPFLAGS ) target_include_directories ( lowmem PUBLIC diff --git a/extra/src/so_rules/sid_18758/CMakeLists.txt b/extra/src/so_rules/sid_18758/CMakeLists.txt index 07024db56..32406a089 100644 --- a/extra/src/so_rules/sid_18758/CMakeLists.txt +++ b/extra/src/so_rules/sid_18758/CMakeLists.txt @@ -18,13 +18,10 @@ add_library ( sid_18758.h ) -execute_process( - COMMAND pkg-config --variable=daq_cppflags snort - OUTPUT_VARIABLE DAQ_CPPFLAGS -) - -string(REGEX REPLACE "[\r\n]" " " DAQ_CPPFLAGS "${DAQ_CPPFLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${DAQ_CPPFLAGS}") +set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) +if ( DAQ_CPPFLAGS ) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DAQ_CPPFLAGS}" ) +endif ( DAQ_CPPFLAGS ) target_include_directories ( sid_18758 PUBLIC diff --git a/extra/templates/CMakeLists.txt.erb b/extra/templates/CMakeLists.txt.erb index e451d3752..6398519eb 100644 --- a/extra/templates/CMakeLists.txt.erb +++ b/extra/templates/CMakeLists.txt.erb @@ -34,11 +34,17 @@ add_library ( ) %if @project.language == "CXX" -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") +set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) +if ( DAQ_CPPFLAGS ) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DAQ_CPPFLAGS}" ) +endif ( DAQ_CPPFLAGS ) %end %if @project.language == "C" -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") +set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99" ) +if ( DAQ_CPPFLAGS ) + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DAQ_CPPFLAGS}" ) +endif ( DAQ_CPPFLAGS ) %end target_include_directories ( diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5c47026bb..c9522ccfd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -63,11 +63,11 @@ if (STATIC_CODECS) ) endif() -if (BUILD_UNIT_TESTS) +if (ENABLE_UNIT_TESTS) enable_testing() set( UNIT_TESTS_LIBRARIES catch_tests) add_subdirectory(catch) -endif (BUILD_UNIT_TESTS) +endif (ENABLE_UNIT_TESTS) if ( ENABLE_PIGLET ) set ( PIGLET_LIBRARIES piglet piglet_plugins ) diff --git a/src/Makefile.am b/src/Makefile.am index 4099ea222..374b4e400 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,7 +29,7 @@ codecs/root/libroot_codecs.a \ codecs/link/liblink_codecs.a endif -if BUILD_UNIT_TESTS +if ENABLE_UNIT_TESTS test_list = catch/libcatch_tests.a endif @@ -150,7 +150,7 @@ time \ profiler \ utils -if BUILD_UNIT_TESTS +if ENABLE_UNIT_TESTS SUBDIRS += catch endif diff --git a/src/catch/CMakeLists.txt b/src/catch/CMakeLists.txt index 8e5290e7c..66f48362a 100644 --- a/src/catch/CMakeLists.txt +++ b/src/catch/CMakeLists.txt @@ -1,5 +1,5 @@ -if ( BUILD_UNIT_TESTS ) +if ( ENABLE_UNIT_TESTS ) find_package(CHECK REQUIRED) include_directories(AFTER ${CHECK_INCLUDE_DIR}) diff --git a/src/connectors/file_connector/Makefile.am b/src/connectors/file_connector/Makefile.am index c77ae2cee..2281a9ecf 100644 --- a/src/connectors/file_connector/Makefile.am +++ b/src/connectors/file_connector/Makefile.am @@ -8,7 +8,7 @@ file_connector_config.h \ file_connector_module.cc \ file_connector_module.h -if BUILD_UNIT_TESTS +if ENABLE_UNIT_TESTS SUBDIRS = test endif diff --git a/src/filters/CMakeLists.txt b/src/filters/CMakeLists.txt index bc46e5209..fb6cf216d 100644 --- a/src/filters/CMakeLists.txt +++ b/src/filters/CMakeLists.txt @@ -3,7 +3,7 @@ set (FILTER_INCLUDES sfrf.h ) -if ( BUILD_UNIT_TESTS ) +if ( ENABLE_UNIT_TESTS ) set(TEST_FILES sfrf_test.cc sfthd_test.cc diff --git a/src/filters/Makefile.am b/src/filters/Makefile.am index 52d38e159..e42ecc7dd 100644 --- a/src/filters/Makefile.am +++ b/src/filters/Makefile.am @@ -17,7 +17,7 @@ sfrf.cc \ sfthd.cc \ sfthd.h -if BUILD_UNIT_TESTS +if ENABLE_UNIT_TESTS libfilter_a_SOURCES += \ sfrf_test.cc \ sfthd_test.cc diff --git a/src/flow/Makefile.am b/src/flow/Makefile.am index eff058837..9ad0cb4c7 100644 --- a/src/flow/Makefile.am +++ b/src/flow/Makefile.am @@ -23,7 +23,7 @@ session.h AM_CXXFLAGS = @AM_CXXFLAGS@ -if BUILD_UNIT_TESTS +if ENABLE_UNIT_TESTS SUBDIRS = test endif diff --git a/src/framework/CMakeLists.txt b/src/framework/CMakeLists.txt index 548b80cb2..53d922fe1 100644 --- a/src/framework/CMakeLists.txt +++ b/src/framework/CMakeLists.txt @@ -40,9 +40,9 @@ install (FILES ${FRAMEWORK_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}/api_options.h DESTINATION "${INCLUDE_INSTALL_PATH}/framework" ) -if ( BUILD_UNIT_TESTS ) +if ( ENABLE_UNIT_TESTS ) target_link_libraries ( framework catch_tests ) -endif ( BUILD_UNIT_TESTS ) +endif ( ENABLE_UNIT_TESTS ) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/api_options.h diff --git a/src/host_tracker/Makefile.am b/src/host_tracker/Makefile.am index 1fadc5388..aabdd598c 100644 --- a/src/host_tracker/Makefile.am +++ b/src/host_tracker/Makefile.am @@ -11,7 +11,7 @@ host_tracker_module.h \ host_tracker.cc \ host_tracker.h -if BUILD_UNIT_TESTS +if ENABLE_UNIT_TESTS SUBDIRS = test endif diff --git a/src/lua/CMakeLists.txt b/src/lua/CMakeLists.txt index 92a406e00..ae230df7d 100644 --- a/src/lua/CMakeLists.txt +++ b/src/lua/CMakeLists.txt @@ -1,5 +1,5 @@ -if ( BUILD_UNIT_TESTS ) +if ( ENABLE_UNIT_TESTS ) set(TEST_FILES lua_stack_test.cc) endif() diff --git a/src/lua/Makefile.am b/src/lua/Makefile.am index e4e086a46..411c748b4 100644 --- a/src/lua/Makefile.am +++ b/src/lua/Makefile.am @@ -26,7 +26,7 @@ lua_arg.h \ lua_stack.h \ lua_test_common.h -if BUILD_UNIT_TESTS +if ENABLE_UNIT_TESTS liblua_a_SOURCES += lua_stack_test.cc endif diff --git a/src/sfip/CMakeLists.txt b/src/sfip/CMakeLists.txt index 89959a85d..329a58cdf 100644 --- a/src/sfip/CMakeLists.txt +++ b/src/sfip/CMakeLists.txt @@ -6,7 +6,7 @@ set(SFIP_INCLUDES sfip_t.h ) -if ( BUILD_UNIT_TESTS ) +if ( ENABLE_UNIT_TESTS ) set(TEST_FILES sfip_test.cc) endif() diff --git a/src/sfip/Makefile.am b/src/sfip/Makefile.am index 8599adac1..e02badde6 100644 --- a/src/sfip/Makefile.am +++ b/src/sfip/Makefile.am @@ -15,7 +15,7 @@ sf_ipvar.cc \ sf_vartable.cc \ sf_vartable.h -if BUILD_UNIT_TESTS +if ENABLE_UNIT_TESTS libsfip_a_SOURCES += sfip_test.cc endif diff --git a/src/sfrt/CMakeLists.txt b/src/sfrt/CMakeLists.txt index b8ae12efd..61c8aa395 100644 --- a/src/sfrt/CMakeLists.txt +++ b/src/sfrt/CMakeLists.txt @@ -8,7 +8,7 @@ set ( SFRT_INCLUDES sfrt_flat_dir.h ) -if ( BUILD_UNIT_TESTS ) +if ( ENABLE_UNIT_TESTS ) set(TEST_FILES sfrt_test.cc) endif() diff --git a/src/sfrt/Makefile.am b/src/sfrt/Makefile.am index 0efff215b..198edbc08 100644 --- a/src/sfrt/Makefile.am +++ b/src/sfrt/Makefile.am @@ -16,7 +16,7 @@ sfrt_dir.cc \ sfrt_flat.cc \ sfrt_flat_dir.cc -if BUILD_UNIT_TESTS +if ENABLE_UNIT_TESTS libsfrt_a_SOURCES += sfrt_test.cc endif diff --git a/src/side_channel/Makefile.am b/src/side_channel/Makefile.am index 8916fb13c..cca13e624 100644 --- a/src/side_channel/Makefile.am +++ b/src/side_channel/Makefile.am @@ -7,7 +7,7 @@ side_channel.h \ side_channel_module.cc \ side_channel_module.h -if BUILD_UNIT_TESTS +if ENABLE_UNIT_TESTS SUBDIRS = test endif diff --git a/src/stream/libtcp/CMakeLists.txt b/src/stream/libtcp/CMakeLists.txt index 02941bbba..4c42b1549 100644 --- a/src/stream/libtcp/CMakeLists.txt +++ b/src/stream/libtcp/CMakeLists.txt @@ -1,5 +1,5 @@ -if ( BUILD_UNIT_TESTS ) +if ( ENABLE_UNIT_TESTS ) set(TEST_FILES stream_tcp_unit_test.cc) endif() diff --git a/src/stream/libtcp/Makefile.am b/src/stream/libtcp/Makefile.am index 02e776c9c..a53a4ebd2 100644 --- a/src/stream/libtcp/Makefile.am +++ b/src/stream/libtcp/Makefile.am @@ -15,7 +15,7 @@ tcp_state_machine.h \ tcp_segment_descriptor.cc \ tcp_segment_descriptor.h -if BUILD_UNIT_TESTS +if ENABLE_UNIT_TESTS libstream_libtcp_a_SOURCES += \ stream_tcp_unit_test.cc \ stream_tcp_unit_test.h diff --git a/src/time/CMakeLists.txt b/src/time/CMakeLists.txt index 7abebf71f..ec5dd24a5 100644 --- a/src/time/CMakeLists.txt +++ b/src/time/CMakeLists.txt @@ -6,9 +6,9 @@ set ( TIME_INTERNAL_SOURCES timersub.h ) -if ( BUILD_UNIT_TESTS ) +if ( ENABLE_UNIT_TESTS ) list ( APPEND TIME_INTERNAL_SOURCES stopwatch_test.cc ) -endif ( BUILD_UNIT_TESTS ) +endif ( ENABLE_UNIT_TESTS ) set ( TIME_INCLUDES cpuclock.h diff --git a/src/time/Makefile.am b/src/time/Makefile.am index 3242a9a5b..b2f89a364 100644 --- a/src/time/Makefile.am +++ b/src/time/Makefile.am @@ -16,6 +16,6 @@ timersub.h \ clock_defs.h \ stopwatch.h -if BUILD_UNIT_TESTS +if ENABLE_UNIT_TESTS libtime_a_SOURCES += stopwatch_test.cc endif diff --git a/tools/snort2lua/CMakeLists.txt b/tools/snort2lua/CMakeLists.txt index efd6421ec..5f92fe569 100644 --- a/tools/snort2lua/CMakeLists.txt +++ b/tools/snort2lua/CMakeLists.txt @@ -9,7 +9,7 @@ add_subdirectory(config_states) add_subdirectory(rule_states) add_subdirectory(helpers) -if (BUILD_UNIT_TESTS) +if (ENABLE_UNIT_TESTS) if (0) add_subdirectory(tests) endif()