From 4899fe96293073d738ba0b9af4da7813333de496 Mon Sep 17 00:00:00 2001 From: mordred Date: Wed, 12 Dec 2018 14:56:37 +0100 Subject: [PATCH] Appveyor should ..hopefully... be fine now --- .appveyor.yml | 3 +++ cmake/FindMySQL.cmake | 2 +- sql_import.sh | 6 ++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 65e32393..6a140060 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -25,4 +25,7 @@ before_build: build_script: - cd .. + - cd bin + - copy "C:\Program Files\MySQL\MySQL Server 5.7\lib\libmysql.dll" libmysql.dll + - cd .. - sh sql_import.sh diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake index b7ff988f..5fd19dae 100644 --- a/cmake/FindMySQL.cmake +++ b/cmake/FindMySQL.cmake @@ -139,7 +139,7 @@ endif( UNIX ) if( WIN32 ) find_library( MYSQL_LIBRARY NAMES - mysqlclient + libmysql PATHS ${MYSQL_ADD_LIBRARIES_PATH} "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7/lib" diff --git a/sql_import.sh b/sql_import.sh index cce9bdef..c2071301 100644 --- a/sql_import.sh +++ b/sql_import.sh @@ -1,3 +1,5 @@ #!/bin/bash -bin/sapphire_dbm --mode initialize --user root --database sapphire --sfile bin/sql/schema/schema.sql --ifile bin/sql/schema/inserts.sql -bin/sapphire_dbm --mode liquidate --user root --database sapphire --force +cd bin +sapphire_dbm --mode initialize --user root --database sapphire --sfile sql/schema/schema.sql --ifile sql/schema/inserts.sql +sapphire_dbm --mode liquidate --user root --database sapphire --force +cd ..