Some updates

2020-02-16 12:15:55 +01:00 · 2020-02-16 12:15:55 +01:00 · e500f8c0aa
parent 71d1cc666b
commit e500f8c0aa
2 changed files with 9 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -232,7 +232,7 @@ set(TEST_LIBRARIES
        tomcrypt::static
        tommath::static

-        mysqlclient::static
+        mysqlclient.a
        jsoncpp_lib
        ${ed25519_LIBRARIES_STATIC}
        ${DataPipes_LIBRARIES_SHARED} # Also includes glib2.0
--- a/src/sql/mysql/MySQL.h
+++ b/src/sql/mysql/MySQL.h
@ -7,7 +7,14 @@
 #include "sql/SqlQuery.h"

 #include "../../misc/spin_lock.h"
-#include <mysql.h>
+
+#if defined(HAVE_MYSQL_MYSQL_H)
+    #include <mysql/mysql.h>
+#elif defined(HAVE_MYSQL_H)
+    #include <mysql.h>
+#else
+    typedef void MYSQL;
+#endif

 #define ERROR_MYSQL_MISSING_DRIVER    -1
 #define ERROR_MYSQL_INVLID_CONNECT    -2