Merge branch '2.0' into 2.1

2017-05-10 09:12:42 +03:00
parent 09349aaa22 898bc3444e
commit 8e2c7fd952
15 changed files with 198 additions and 83 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -60,6 +60,10 @@ include_directories(${PCRE2_INCLUDE_DIRS})
 if(NOT MARIADB_CONNECTOR_FOUND)
  message(STATUS "Building MariaDB Connector-C from source.")
  include(cmake/BuildMariaDBConnector.cmake)
+else()
+  # This is required as the core depends on the `connector-c` target
+  add_custom_target(connector-c)
+  message(STATUS "Using system Connector-C")
 endif()

 if(NOT JANSSON_FOUND)