diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2020-11-02 10:07:05 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2020-11-02 11:11:05 +0100 |
| commit | 504d4c1ff6e0cecde9adfea320abd616d28b21a1 (patch) | |
| tree | af8d862ea546c2886dfb88e1c13dd8743902ef54 | |
| parent | f244b499e736ac55ce5f31eee726096658b5cc6b (diff) | |
| download | mariadb-git-504d4c1ff6e0cecde9adfea320abd616d28b21a1.tar.gz | |
Windows : require at least VS2019 for MSVC.
This will avoid some errors on appveyor, due to outdated SDKs.
| -rw-r--r-- | appveyor.yml | 4 | ||||
| -rw-r--r-- | cmake/os/Windows.cmake | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/appveyor.yml b/appveyor.yml index 4a6a49fd8b5..4c83cb100b0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ version: build-{build}~branch-{branch} before_build: - md %APPVEYOR_BUILD_FOLDER%\win_build - cd %APPVEYOR_BUILD_FOLDER%\win_build - - cmake .. -G "Visual Studio 15 2017 Win64" -DWITH_UNIT_TESTS=0 -DWITH_MARIABACKUP=0 -DMYSQL_MAINTAINER_MODE=ERR -DPLUGIN_ROCKSDB=NO -DPLUGIN_CONNECT=NO -DBISON_EXECUTABLE=C:\cygwin64\bin\bison + - cmake .. -DWITH_UNIT_TESTS=0 -DWITH_MARIABACKUP=0 -DMYSQL_MAINTAINER_MODE=ERR -DPLUGIN_ROCKSDB=NO -DPLUGIN_CONNECT=NO -DBISON_EXECUTABLE=C:\cygwin64\bin\bison build: project: win_build\MySQL.sln @@ -18,4 +18,4 @@ test_script: - cd %APPVEYOR_BUILD_FOLDER%\win_build\mysql-test - perl mysql-test-run.pl --force --max-test-fail=10 --parallel=4 --testcase-timeout=10 --skip-test-list=unstable-tests --suite=main -image: Visual Studio 2017 +image: Visual Studio 2019 diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake index 1383a717bdc..29bd637250d 100644 --- a/cmake/os/Windows.cmake +++ b/cmake/os/Windows.cmake @@ -110,6 +110,9 @@ ENDMACRO() IF(MSVC) + IF(MSVC_VERSION LESS 1920) + MESSAGE(FATAL_ERROR "Visual Studio q2019 or later is required") + ENDIF() # Disable mingw based pkg-config found in Strawberry perl SET(PKG_CONFIG_EXECUTABLE 0 CACHE INTERNAL "") |