Debian 10: MySQL/MariaDB related fixes

Change-Id: I538caf6dedaa785061194a87c7e4965df3839088

cmake/FindMySQL.cmake

@@ -1,24 +1,26 @@
 # Find the MySQL includes and client library
 # This module defines
-#  MYSQL_INCLUDE_DIR, where to find mysql.h
+#  MYSQL_CFLAGS, contain compiler -I parameters with MySQL/MariaDB headers
 #  MYSQL_LIBRARIES, the libraries needed to use MySQL.
 #  MYSQL_FOUND, If false, do not try to use MySQL.
 
 set(MYSQL_CONFIG_PREFER_PATH "$ENV{MYSQL_HOME}/bin" CACHE FILEPATH
     "preferred path to MySQL (mysql_config)")
-find_program(MYSQL_CONFIG mysql_config
+find_program(MYSQL_CONFIG
+    NAMES mysql_config mariadb_config
     ${MYSQL_CONFIG_PREFER_PATH}
     /usr/local/mysql/bin/
+    /usr/local/mariadb/bin/
     /usr/local/bin/
     /usr/bin/
     )
 
 if(MYSQL_CONFIG)
     message(STATUS "Using mysql_config: ${MYSQL_CONFIG}")
-    # set INCLUDE_DIR
+    # set MYSQL_CFLAGS
     exec_program(${MYSQL_CONFIG}
-        ARGS --include
+        ARGS --cflags
-        OUTPUT_VARIABLE MYSQL_INCLUDE_DIR)
+        OUTPUT_VARIABLE MYSQL_CFLAGS)
 
     # set LIBRARY_DIR
     exec_program(${MYSQL_CONFIG}
@@ -34,6 +36,8 @@ else(MYSQL_CONFIG)
         /usr/local/mysql/include/mysql
         /usr/include
         /usr/include/mysql
+        /usr/include/mariadb
+    )
     #find_library(mysqlclient_r ...
     #    PATHS
     #    ${MYSQL_ADD_LIBRARY_PATH}
@@ -42,18 +46,18 @@ else(MYSQL_CONFIG)
     #    /usr/local/lib/mysql
     #    /usr/local/mysql/lib
     #)
-)
+    set(MYSQL_CFLAGS "-I${MYSQL_INCLUDE_DIR}")
 endif(MYSQL_CONFIG)
 
-set(MYSQL_INCLUDE_DIR ${MYSQL_INCLUDE_DIR} CACHE FILEPATH INTERNAL)
+set(MYSQL_CFLAGS ${MYSQL_CFLAGS} CACHE FILEPATH INTERNAL)
 set(MYSQL_LIBRARIES ${MYSQL_LIBRARIES} CACHE FILEPATH INTERNAL)
 
-if(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
+if(MYSQL_CFLAGS AND MYSQL_LIBRARIES)
     set(MYSQL_FOUND TRUE CACHE INTERNAL "MySQL found")
-    message(STATUS "Found MySQL: ${MYSQL_INCLUDE_DIR}, ${MYSQL_LIBRARIES}")
+    message(STATUS "Found MySQL: ${MYSQL_CFLAGS}, ${MYSQL_LIBRARIES}")
-else(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
+else(MYSQL_CFLAGS AND MYSQL_LIBRARIES)
     set(MYSQL_FOUND FALSE CACHE INTERNAL "MySQL found")
     message(STATUS "MySQL not found.")
-endif(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
+endif(MYSQL_CFLAGS AND MYSQL_LIBRARIES)
 
-mark_as_advanced(MYSQL_INCLUDE_DIR MYSQL_LIBRARIES)
+mark_as_advanced(MYSQL_CFLAGS MYSQL_LIBRARIES)

src/core/cpn/CMakeLists.txt

@@ -5,7 +5,7 @@ set(SRCS
 )
 
 find_package(MySQL REQUIRED)
-include_directories(${MYSQL_INCLUDE_DIR})
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MYSQL_CFLAGS}")
 
 # only compile concrete implementation of InjectionPoint
 if(CONFIG_INJECTIONPOINT_HOPS)

src/core/util/CMakeLists.txt

@@ -57,6 +57,10 @@ find_package(LibDwarf REQUIRED)
 include_directories(${LIBELF_INCLUDE_DIRS})
 include_directories(${LIBDWARF_INCLUDE_DIRS})
 
+# Database.hpp
+find_package(MySQL REQUIRED)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MYSQL_CFLAGS}")
+
 # objdump required by Diassembler.cc
 
 set(THE_OBJDUMP "${ARCH_TOOL_PREFIX}objdump")

src/core/util/Database.hpp

@@ -6,7 +6,7 @@
 #endif
 
 #include <vector>
-#include <mysql/mysql.h>
+#include <mysql.h>
 #include <iostream>
 #include <string>
 

src/experiments/dciao-kernelstructs/CMakeLists.txt

@@ -22,7 +22,7 @@ include_directories(${PROTOBUF_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 find_package(MySQL REQUIRED)
-include_directories(${MYSQL_INCLUDE_DIR})
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MYSQL_CFLAGS}")
 
 set(PROTOBUF_IMPORT_DIRS ${PROTOBUF_IMPORT_DIRS} ${CMAKE_CURRENT_BINARY_DIR}/../../core/comm)
 PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})

src/experiments/ecos_kernel_test/CMakeLists.txt

@@ -23,7 +23,7 @@ include_directories(${PROTOBUF_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 find_package(MySQL REQUIRED)
-include_directories(${MYSQL_INCLUDE_DIR})
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MYSQL_CFLAGS}")
 
 set(PROTOBUF_IMPORT_DIRS ${PROTOBUF_IMPORT_DIRS} ${CMAKE_CURRENT_BINARY_DIR}/../../core/comm)
 PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})

src/experiments/fiascoFail/CMakeLists.txt

@@ -24,7 +24,7 @@ include_directories(${PROTOBUF_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 find_package(MySQL REQUIRED)
-include_directories(${MYSQL_INCLUDE_DIR})
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MYSQL_CFLAGS}")
 
 set(PROTOBUF_IMPORT_DIRS ${PROTOBUF_IMPORT_DIRS} ${CMAKE_CURRENT_BINARY_DIR}/../../core/comm)
 PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})

src/experiments/generic-experiment/CMakeLists.txt

@@ -22,7 +22,7 @@ include_directories(${PROTOBUF_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 find_package(MySQL REQUIRED)
-include_directories(${MYSQL_INCLUDE_DIR})
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MYSQL_CFLAGS}")
 
 PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})
 

src/experiments/kesogc/CMakeLists.txt

@@ -22,7 +22,7 @@ include_directories(${PROTOBUF_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 find_package(MySQL REQUIRED)
-include_directories(${MYSQL_INCLUDE_DIR})
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MYSQL_CFLAGS}")
 
 set(PROTOBUF_IMPORT_DIRS ${PROTOBUF_IMPORT_DIRS} ${CMAKE_CURRENT_BINARY_DIR}/../../core/comm)
 PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})

src/experiments/kesorefs/CMakeLists.txt

@@ -22,7 +22,7 @@ include_directories(${PROTOBUF_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 find_package(MySQL REQUIRED)
-include_directories(${MYSQL_INCLUDE_DIR})
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MYSQL_CFLAGS}")
 
 set(PROTOBUF_IMPORT_DIRS ${PROTOBUF_IMPORT_DIRS} ${CMAKE_CURRENT_BINARY_DIR}/../../core/comm)
 PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})

src/experiments/vezs-example/CMakeLists.txt

@@ -22,7 +22,7 @@ include_directories(${PROTOBUF_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 find_package(MySQL REQUIRED)
-include_directories(${MYSQL_INCLUDE_DIR})
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MYSQL_CFLAGS}")
 
 set(PROTOBUF_IMPORT_DIRS ${PROTOBUF_IMPORT_DIRS} ${CMAKE_CURRENT_BINARY_DIR}/../../core/comm)
 PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})

tools/import-trace/CMakeLists.txt

@@ -32,7 +32,7 @@ if (BUILD_LLVM_DISASSEMBLER)
 endif(BUILD_LLVM_DISASSEMBLER)
 
 find_package(MySQL REQUIRED)
-include_directories(${MYSQL_INCLUDE_DIR})
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MYSQL_CFLAGS}")
 
 add_executable(import-trace main.cc ${SRCS})
 

tools/import-trace/Importer.hpp

@@ -1,7 +1,7 @@
 #ifndef __IMPORTER_H__
 #define __IMPORTER_H__
 
-#include <mysql/mysql.h>
+#include <mysql.h>
 #include <map>
 #include <sstream>
 #include "util/ProtoStream.hpp"

tools/prune-trace/CMakeLists.txt

@@ -6,7 +6,7 @@ set(SRCS
 )
 
 find_package(MySQL REQUIRED)
-include_directories(${MYSQL_INCLUDE_DIR})
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MYSQL_CFLAGS}")
 
 ## This is the example's campaign server distributing experiment parameters
 add_executable(prune-trace main.cc ${SRCS})

tools/prune-trace/main.cc

@@ -1,4 +1,4 @@
-#include <mysql/mysql.h>
+#include <mysql.h>
 #include <iostream>
 #include <string>