From c96d27a495bf7edc3a89be9c7c7568dc0f521a60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Mon, 22 Jan 2018 20:39:25 +0200 Subject: [PATCH] MXS-1538: Use the integrated CDC connector Now that the connector resides in the same repository, it can be built as a library for the tests. Installing the development package is one option but it would unnecessarily complicate the build process. --- maxscale-system-test/utilities.cmake | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/maxscale-system-test/utilities.cmake b/maxscale-system-test/utilities.cmake index daf13dc63..a683b7fd0 100644 --- a/maxscale-system-test/utilities.cmake +++ b/maxscale-system-test/utilities.cmake @@ -104,17 +104,8 @@ include_directories(${CMAKE_BINARY_DIR}/include) set(MYSQL_CLIENT ${CMAKE_BINARY_DIR}/lib/mariadb/libmariadbclient.a CACHE INTERNAL "") # Build the CDC connector -ExternalProject_Add(cdc_connector - GIT_REPOSITORY https://github.com/mariadb-corporation/maxscale-cdc-connector.git - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/cdc_connector/ - BUILD_COMMAND make - INSTALL_COMMAND make install - UPDATE_COMMAND "") - -include(GNUInstallDirs) -set(CDC_CONNECTOR_INCLUDE ${CMAKE_BINARY_DIR}/cdc_connector/${CMAKE_INSTALL_INCLUDEDIR}/ CACHE INTERNAL "") -set(CDC_CONNECTOR_LIBRARIES ${CMAKE_BINARY_DIR}/cdc_connector/${CMAKE_INSTALL_LIBDIR}/libcdc_connector.so CACHE INTERNAL "") -include_directories(${CMAKE_BINARY_DIR}/cdc_connector/${CMAKE_INSTALL_INCLUDEDIR}) +add_library(cdc_connector ${CMAKE_SOURCE_DIR}/../connectors/cdc-connector/cdc_connector.cpp) +include_directories(${CMAKE_SOURCE_DIR}/../connectors/cdc-connector/) # # Check that all required components are present. To build even without them,