From 7f045beb59cf765194d56119027c11397f72fb88 Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Thu, 8 Feb 2018 11:19:31 +0200 Subject: [PATCH] Fix include conflict in qc_mysqlembedded qc_mysqlembedded must include the headers from the embedded library and not from Connector-C. So, it must be ensured the embedded library include directories are first. --- query_classifier/qc_mysqlembedded/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/query_classifier/qc_mysqlembedded/CMakeLists.txt b/query_classifier/qc_mysqlembedded/CMakeLists.txt index dfabd70a1..27f620ddc 100644 --- a/query_classifier/qc_mysqlembedded/CMakeLists.txt +++ b/query_classifier/qc_mysqlembedded/CMakeLists.txt @@ -3,9 +3,9 @@ if (BUILD_QC_MYSQLEMBEDDED) # Include the embedded library headers subdirs(MYSQL_INCLUDE_DIR_ALL ${MYSQL_EMBEDDED_INCLUDE_DIR}) foreach(DIR ${MYSQL_INCLUDE_DIR_ALL}) - include_directories(${DIR}) + include_directories(BEFORE ${DIR}) endforeach() - include_directories(${MYSQL_EMBEDDED_INCLUDE_DIR}/..) + include_directories(BEFORE ${MYSQL_EMBEDDED_INCLUDE_DIR}/..) add_library(qc_mysqlembedded SHARED qc_mysqlembedded.cc)