diff --git a/appveyor.yml b/appveyor.yml index 889778998..128811bb7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,8 +12,8 @@ services: - mssql2014 configuration: - - Debug - Release + - Debug install: - systeminfo diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake index 865a24f19..84a2ee604 100644 --- a/cmake/FindMySQL.cmake +++ b/cmake/FindMySQL.cmake @@ -12,8 +12,8 @@ find_path(MYSQL_INCLUDE_DIR mysql.h $ENV{MYSQL_DIR}/include $ENV{ProgramFiles}/MySQL/*/include ${BINDIR32}/MySQL/include - ${BINDIR32}/MySQL/*/include - $ENV{SystemDrive}/MySQL/*/include) + ${BINDIR32}/MySQL/*/include + $ENV{SystemDrive}/MySQL/*/include) if (WIN32) if (CMAKE_BUILD_TYPE STREQUAL Debug) @@ -32,6 +32,7 @@ if (WIN32) $ENV{MYSQL_DIR}/client/${libsuffixBuild} $ENV{ProgramFiles}/MySQL/*/lib/${libsuffixDist} ${BINDIR32}/MySQL/lib + ${BINDIR32}/MySQL/*/lib ${BINDIR32}/MySQL/*/lib/vs12 ${BINDIR32}/MySQL/*/lib/vs11 ${BINDIR32}/MySQL/*/lib/vs10