From 65096902c18ce644d847abc8960fa5ef63c6e3be Mon Sep 17 00:00:00 2001 From: Christian Beer Date: Sat, 20 Apr 2019 13:50:22 +0200 Subject: [PATCH] Tests: adjust mysql library detection for Travis CI Ubuntu image --- tests/unit-tests/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/unit-tests/CMakeLists.txt b/tests/unit-tests/CMakeLists.txt index 766632a116..7fbc12c735 100644 --- a/tests/unit-tests/CMakeLists.txt +++ b/tests/unit-tests/CMakeLists.txt @@ -21,6 +21,7 @@ include_directories("${PROJECT_SOURCE_DIR}/../../lib") include_directories("${PROJECT_SOURCE_DIR}/../../tools") include_directories("/usr/include/mariadb") include_directories("/usr/include/mariadb/mysql") +include_directories("/usr/include/mysql") find_library(GTEST_MAIN_LIB libgtest_main.a PATHS ${PROJECT_SOURCE_DIR}/../../3rdParty/buildCache/linux/lib NO_DEFAULT_PATH) @@ -30,7 +31,7 @@ message(STATUS "gtest_lib: ${GTEST_LIB}") find_library(SCHED_LIB libsched.a PATHS ${PROJECT_SOURCE_DIR}/../../sched NO_DEFAULT_PATH) find_library(BOINC_CRYPT_LIB libboinc_crypt.a PATHS ${PROJECT_SOURCE_DIR}/../../lib NO_DEFAULT_PATH) find_library(BOINC_LIB libboinc.a PATHS ${PROJECT_SOURCE_DIR}/../../lib NO_DEFAULT_PATH) -find_library(MYSQL_LIB NAMES mariadb mysql) +find_library(MYSQL_LIB NAMES mariadb mysqlclient) message(STATUS "mysql_lib: ${MYSQL_LIB}") add_subdirectory(lib)