Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
504d4c1f
Commit
504d4c1f
authored
4 years ago
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Windows : require at least VS2019 for MSVC.
This will avoid some errors on appveyor, due to outdated SDKs.
parent
f244b499
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
appveyor.yml
appveyor.yml
+2
-2
cmake/os/Windows.cmake
cmake/os/Windows.cmake
+3
-0
No files found.
appveyor.yml
View file @
504d4c1f
...
...
@@ -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
201
7
image
:
Visual Studio
201
9
This diff is collapsed.
Click to expand it.
cmake/os/Windows.cmake
View file @
504d4c1f
...
...
@@ -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
""
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment