Merge branch '2.3' into develop

2019-01-15 15:57:06 +02:00
parent fb2a44f62d 8cef8b9472
commit dae99b2acd
3 changed files with 205 additions and 1 deletions
--- a/server/modules/monitor/mariadbmon/CMakeLists.txt
+++ b/server/modules/monitor/mariadbmon/CMakeLists.txt
@ -4,4 +4,6 @@ target_link_libraries(mariadbmon maxscale-common)
 add_dependencies(mariadbmon pcre2)
 set_target_properties(mariadbmon PROPERTIES VERSION "1.4.0" LINK_FLAGS -Wl,-z,defs)
 install_module(mariadbmon core)
-add_subdirectory(test)
+if(BUILD_TESTS)
+    add_subdirectory(test)
+endif()