From 6602ce18c7a830bfaeb9f00a1424d67c441801e2 Mon Sep 17 00:00:00 2001 From: ruben Date: Thu, 2 Apr 2020 20:15:07 +0100 Subject: [PATCH] Changed MySQL root passwd in Appveyor --- .appveyor.yml | 1 + CMakeLists.txt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 40af31b4..f5898c99 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -8,6 +8,7 @@ platform: build_script: - set PATH=C:\Program Files\MySQL\MySQL Server 5.7\bin;%PATH% + - mysqladmin --user=root Password12! "" - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" - mkdir build - cd build diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ef8f9cf..b93a4c60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,8 +20,9 @@ function(_mysql_common_target_settings TARGET_NAME) _WIN32_WINNT=0x0601 # Warnings in Windows (TODO: find a better way?) _SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING # Warnings in C++17 for Asio ) + # For some reason, Appveyor setup needs this to link against coroutine target_link_directories(${TARGET_NAME} PRIVATE ${Boost_LIBRARY_DIRS}) - target_compile_options(${TARGET_NAME} PRIVATE /bigobj) + target_compile_options(${TARGET_NAME} PRIVATE /bigobj) # Prevent failures on Windows else() target_compile_options(${TARGET_NAME} PRIVATE -Wall -Wextra -pedantic -Werror) endif()