Final fixes, preparing for merge.

This commit is contained in:
Robin Sommer 2014-07-31 10:49:50 -07:00
parent 2b505b07c1
commit aa731eeaec
6 changed files with 15 additions and 12 deletions

View file

@ -19,4 +19,5 @@ set(logging_SRCS
bif_target(logging.bif)
bro_add_subdir_library(logging ${logging_SRCS} ${BIF_OUTPUT_CC})
add_dependencies(bro_logging generate_outputs)

View file

@ -10,9 +10,16 @@ if (NOT DISABLE_DATASERIES AND
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
include_directories(BEFORE ${Lintel_INCLUDE_DIR})
include_directories(BEFORE ${DataSeries_INCLUDE_DIR})
include_directories(BEFORE ${LibXML2_INCLUDE_DIR})
bro_plugin_begin(Bro DataSeriesWriter)
bro_plugin_cc(DataSeries.cc Plugin.cc)
bro_plugin_bif(dataseries.bif)
bro_plugin_link_library(${Lintel_LIBRARIES})
bro_plugin_link_library(${DataSeries_LIBRARIES})
bro_plugin_link_library(${LibXML2_LIBRARIES})
bro_plugin_end()
endif()

View file

@ -12,6 +12,7 @@
#include <DataSeries/GeneralField.hpp>
#include "logging/WriterBackend.h"
#include "threading/formatters/Ascii.h"
namespace logging { namespace writer {