diff options
| author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2020-04-03 19:14:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-03 21:14:09 +0200 |
| commit | 1df52da0b052654a9b42339fdd22028bfdbf9fc0 (patch) | |
| tree | 5462b17cda315c25bdad6ea8ca6914c22ae65d09 | |
| parent | 69f4024929c546af4cce121b8d6d9adb9f6acefb (diff) | |
Require Visual Studio 2019 16.4 or greater (#24214)
* CI/AppVeyor: Add appveyor.yml file
* Build: Require Visual Studio 2019 16.4 or greater
* CI/AppVeyor: Upgrade to VS2019 image
* Update cmake error message
* CI/AppVeyor: Fix appveyor VS 2019 configuration
| -rw-r--r-- | appveyor.yml | 31 | ||||
| -rw-r--r-- | cmake/compiler/msvc/settings.cmake | 4 |
2 files changed, 33 insertions, 2 deletions
diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 00000000000..1e1e938b194 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,31 @@ +version: 1.0.{build} +image: Visual Studio 2019 +clone_depth: 1 +init: +- ps: '' +environment: + BOOST_ROOT: C:\Libraries\boost_1_71_0 + OPENSSL_ROOT_DIR: C:\OpenSSL-Win64 +build_script: +- cmd: >- + git config user.email "appveyor@build.bot" && git config user.name "AppVeyor" + + git tag -a -m "AppVeyor build" init + + md build && cd build + + cmake -G"Visual Studio 16 2019" -A x64 -DSCRIPTS=dynamic -DTOOLS=True -DCMAKE_CXX_FLAGS=" /DWIN32 /D_WINDOWS /W3 /GR /EHsc /WX" -DCMAKE_C_FLAGS="/DWIN32 /D_WINDOWS /W3 /WX" .. + + "%programfiles(x86)%\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\amd64\MsBuild.exe" /nologo /m:2 /p:Configuration=RelWithDebInfo /p:Platform="X64" /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" "TrinityCore.sln" + + cd bin\RelWithDebInfo\ + + copy "C:\Program Files\MySQL\MySQL Server 5.7\lib\libmysql.dll" libmysql.dll + + copy "%OPENSSL_ROOT_DIR%\ssleay32.dll" ssleay32.dll + + copy "%OPENSSL_ROOT_DIR%\libeay32.dll" libeay32.dll +test: off +artifacts: +- path: build\bin\RelWithDebInfo\ + name: TrinityCoreWin64VS2019 diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake index ed98273e22a..5ab1ca4cef0 100644 --- a/cmake/compiler/msvc/settings.cmake +++ b/cmake/compiler/msvc/settings.cmake @@ -1,8 +1,8 @@ # set up output paths for executable binaries (.exe-files, and .dll-files on DLL-capable platforms) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) -set(MSVC_EXPECTED_VERSION 19.16) -set(MSVC_EXPECTED_VERSION_STRING "MSVC 2017") +set(MSVC_EXPECTED_VERSION 19.24) +set(MSVC_EXPECTED_VERSION_STRING "Microsoft Visual Studio 2019 16.4") if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS MSVC_EXPECTED_VERSION) message(FATAL_ERROR "MSVC: TrinityCore requires version ${MSVC_EXPECTED_VERSION} (${MSVC_EXPECTED_VERSION_STRING}) to build but found ${CMAKE_CXX_COMPILER_VERSION}") |