Merge branch '2.1' into 2.2

2018-03-06 10:38:01 +02:00
parent 544e0eb60b 9144ed3448
commit 8bfb4f231a
6 changed files with 28 additions and 8 deletions
--- a/server/modules/routing/avrorouter/CMakeLists.txt
+++ b/server/modules/routing/avrorouter/CMakeLists.txt
@ -11,5 +11,6 @@ if(AVRO_FOUND AND JANSSON_FOUND)
    add_subdirectory(test)
  endif()
 else()
-  message(STATUS "No Avro C or Jansson libraries found, not building avrorouter.")
+  message(FATAL_ERROR "No Avro C or Jansson libraries found, cannot build avrorouter. "
+    "Use the -DBUILD_CDC=N  option to `cmake` to disable building of the avrorouter.")
 endif()