hcq/MaxScale
hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix include conflict in qc_mysqlembedded

Browse Source 
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.
This commit is contained in:
Johan Wikman 2018-02-08 11:19:31 +02:00
parent 823fe902d4
commit 7f045beb59
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
query_classifier/qc_mysqlembedded/CMakeLists.txt
View File

@ -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)