Merge branch '2.1' into 2.2

2018-01-30 16:28:11 +02:00
parent 6410b4f19a 6dcc71d862
commit 3dfb972d87
21 changed files with 550 additions and 197 deletions
--- a/server/modules/routing/avrorouter/CMakeLists.txt
+++ b/server/modules/routing/avrorouter/CMakeLists.txt
@ -6,6 +6,10 @@ if(AVRO_FOUND AND JANSSON_FOUND)
  set_target_properties(avrorouter PROPERTIES LINK_FLAGS -Wl,-z,defs)
  target_link_libraries(avrorouter maxscale-common ${JANSSON_LIBRARIES} ${AVRO_LIBRARIES} maxavro lzma)
  install_module(avrorouter core)
+
+  if (BUILD_TESTS)
+    add_subdirectory(test)
+  endif()
 else()
  message(STATUS "No Avro C or Jansson libraries found, not building avrorouter.")
 endif()