more updates

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3241abdf1f0ed218fc3e977cec098603e895fa14..ddff1b9ca9c955a568844a490107410d0606d0d6 100644 (file)
--- 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 adddec69566629e28a46c90b2467bb97e5182ebb..02352fa5fd08ed37a02159a1501e42c2fad791be 100644 (file)
--- 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 6cfee9ad1d153834b95e477610560553e4fdcc28..c21e637f22d261c1b77f96b0a58a762b5353f288 100644 (file)
--- 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 a5d260bf3f36ae35c6b2cc328974c0f768e6850b..4d4b793b3831f8681caece53b655c83bb53d60bd 100644 (file)
--- 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 0e50d1049558f7ffb7f0c783f0ab9b6fd7e64c9a..43f172aeb55776a2a464d72019517261ab1581be 100644 (file)
--- 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 779f1265479bc92a33d04f03149e279fd66f9118..e66ca295a499b306f5a9889cf2384b56d39f5269 100755 (executable)
--- 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 db9e1ecce3ab9ea5f66e25f015f023960a1b3395..492cee1fbaad13eb9bb3027ac34c58a7a7e2d2cf 100644 (file)
--- 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 8522526548ea53ed8fbcce4892aed0c3acf41b90..9eb61a76586002ebd5bae9a240751723cb81135f 100644 (file)
--- 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 b32844f0acf4bd54f2c468f94a6167de96e43645..8b63255ee2e7930befeb2d8181c88af1dd1d7aa6 100644 (file)
--- 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 ab389eba32a9771128acb8009a986cd7d2e118f3..6d0c59d5f5604b07171d18199a7efc9eeeb4cec4 100644 (file)
--- 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 2b7163801302f2c40e260bffd03314a4925cf5b2..f5362c66e8e54be85a29686d8b3bd0db8e316b31 100644 (file)
--- 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 eeef35b219adbeef955667170deb0c26bf5db467..28a4a51db4e8de23ab7dad1b2653a5ee4134060f 100644 (file)
--- 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 61b096d1f10de7e72de1c6c697322686a4ab1743..b4baab7bf4e1af227d8216ee04b17ccd26292558 100644 (file)
--- 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 c5787269651ce4ab486232a7f1a213a005745037..5621f4b05a9da8576ddf8ced88f581e7d3ed481f 100644 (file)
--- 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 1abc81f5c383547c714c161361cd3ec97c404818..6daa00f7c66f5cfca1a75527f5d5f81c552ef357 100644 (file)
--- 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 ddcf515e179f6174cfacc6f92a20f3135e509545..a6171c182bff5836d33e191b3573df04bd43d0b9 100644 (file)
--- 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 fe1c500b3b4824b14ae120164b51c64c78a3406b..d1b9afa506df3d3f878fd10c12228ce86115e2fb 100644 (file)
--- 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 355bda715f904f6b15a81318e7eb0fcfe9256295..2aacecaaf1dccdcaec0b097edbe5178a65a79ecf 100644 (file)
--- 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 5b8a31e4c3ff46b0ba1d1a4342c4937be3530479..1c4ffc94d8f61c0e30cc5a8664bb4b02999a1d9b 100644 (file)
--- 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 3a7fcddd76d525a0db4fd5130133f2b16270b19c..c15ff502a8597dc73b23473ba77dfcda50d4e9fd 100644 (file)
--- 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 6b45aa15b6749b495c3045f123980685c302d625..99acf674eed3e45934a0af79abe16354162a9481 100644 (file)
--- 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 d7981e5f88405026f26574639a7e22c2bd19b3fa..fd6b4d42bee43aa422fbeef32c3cf4f3761fa9d6 100644 (file)
--- 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 81a7415ed7435d482b515abe87fcec01c4cdbb45..908f1090b2353c67277473f53f8cabbb057586d3 100644 (file)
--- 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 a5b6f4b1462f5be3511dd303a1742a08e1dbf1b3..eaf3a5cd6eb6c1d4558f455cd3f7a5991b7b3bdb 100644 (file)
--- 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 3fadaae8023693a0737d9889dbc5098e202747c6..be09f451f3f4589bb7b45bf002f610d28684775d 100644 (file)
--- 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 900f823a40550b20fe8c7fbe4f459e7e6ef34668..c2455c03414aedfe36057cbe4d32daed092604a1 100644 (file)
--- 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 45aa1e7ad043125b819aca18548a3df098225083..a74645fd0867a1d125c09fd0e15d0260be049fe6 100644 (file)
--- 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 e70c01e0ee452049bbc118de70ef80566396964f..d157bc253153836fc0dff9795b9c36c0f10a6b08 100644 (file)
--- 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 07024db562a07d9a950c82af26f0057c410a5ff3..32406a0897e3e2092fe39cce399adbcb56ce4cdd 100644 (file)
--- 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 e451d3752bd22d0394851c65409d2330a109cafa..6398519ebdc018aba8dd34dbe0bc04ad3f3ec2f1 100644 (file)
--- 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 5c47026bb783dead01b76569109465e4a9234d22..c9522ccfdc4315e0696907f6dffb4fdbc42ebc2a 100644 (file)
--- 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 4099ea222fcdb96e8c7d64df115ae21703742886..374b4e40092b4b35972a49de71fe4e7d50818494 100644 (file)
--- 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 8e5290e7c80dd604dcd78616c2dd3982ed60e81a..66f48362a454faaecea454f9fc37325da1064b7f 100644 (file)
--- 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 c77ae2cee5890355d7d6763890b1fd6974f79de0..2281a9ecf5c47af8efb4b4fd2074e21816d22737 100644 (file)
--- 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 bc46e52096361f0095c30c061ecb2fa2465915b6..fb6cf216d26109b5f48ad4b5299c2f56af93ce18 100644 (file)
--- 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 52d38e1594f71e715ec2032eb3360b3caef668cf..e42ecc7dd9d3c7887bc00f27186b7a69ed7067f4 100644 (file)
--- 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 eff05883719ad3627e0c85e38b02caccb4b3069f..9ad0cb4c74ab807127e2f129ca18fc7b7a89d731 100644 (file)
--- 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 548b80cb2902947aed95b974779dfbb97b83632e..53d922fe17a4d5a10de398e19abc290f2ea00b23 100644 (file)
--- 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 1fadc5388807dcdac29454468b99d2a7b53cd8ca..aabdd598ce31707ad1a202630d144da4256c5383 100644 (file)
--- 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 92a406e00b4364bc2ef7ee7bc928362bb4f64c36..ae230df7d185e69e5a80d41dfdd4cd407f981bd9 100644 (file)
--- 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 e4e086a468e3c1b61a9fbe20d8dca84d497bc5d5..411c748b4a56a731a3e97d6c8b785c339e9a8ec8 100644 (file)
--- 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 89959a85d0d1dfb1248e3760149cb40ee44b21d4..329a58cdf82f91633a1a55392575f32ee2337181 100644 (file)
--- 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 8599adac1dee9e1af37842c1a5ee36aa0251ce42..e02badde6f37037fc0df4c5964116bfbfdef3898 100644 (file)
--- 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 b8ae12efd199116407b01c97271a850b2dc0136d..61c8aa39570a3e05a832ec3a6923bbd036a8c743 100644 (file)
--- 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 0efff215bafa92a9294ef3621b02cbb621efd7bf..198edbc082cac6f7f5f8bc5c8d63b90d4cf13f84 100644 (file)
--- 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 8916fb13cc811d3fd00244e22ef0313a7b0e1a69..cca13e624fcfd9f88122acaff0895f55908239f2 100644 (file)
--- 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 02941bbbac68dccdc3c63815946a515f58ac5589..4c42b154919fe20791db856b40ed52324c50762c 100644 (file)
--- 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 02e776c9c2f95c223a1498ae0dd8918c8f89cd59..a53a4ebd246142ed666f3957e27256d95d3a0455 100644 (file)
--- 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 7abebf71f52fb510fe433072d8dcd3a8b2820571..ec5dd24a5a5e74cab702aaa5eb3d177ecf2cda0c 100644 (file)
--- 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 3242a9a5bc3af590c038e9f54bf8f3ca67bf2835..b2f89a36451e6bd2eca467feb04c9735b8a7c8f8 100644 (file)
--- 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 efd6421ecfb576f82ad09bc9131a543b87f84250..5f92fe569dcd90ae94a099c5e6585cc5a23e8097 100644 (file)
--- 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()