diff --git a/appveyor.yml b/appveyor.yml index f1691dd4..f6723e1b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -51,58 +51,6 @@ configuration: Debug # https://cmake.org/cmake/help/latest/manual/cmake-generators.7.html#visual-studio-generators environment: matrix: - # Visual Studio 2013 Win32 - - GENERATOR: Visual Studio 12 2013 - PLATFORM: Win32 - EXPAT_DLL: libexpatd.dll - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - - # Visual Studio 2013 Win32 XML_UNICODE_WCHAR_T - - GENERATOR: Visual Studio 12 2013 - PLATFORM: Win32 - CMAKE_ARGS: -DEXPAT_CHAR_TYPE=wchar_t - EXPAT_DLL: libexpatwd.dll - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - - # Visual Studio 2013 x64 - - GENERATOR: Visual Studio 12 2013 Win64 - PLATFORM: x64 - EXPAT_DLL: libexpatd.dll - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - - # Visual Studio 2013 x64 XML_UNICODE_WCHAR_T - - GENERATOR: Visual Studio 12 2013 Win64 - PLATFORM: x64 - CMAKE_ARGS: -DEXPAT_CHAR_TYPE=wchar_t - EXPAT_DLL: libexpatwd.dll - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - - # Visual Studio 2015 Win32 - - GENERATOR: Visual Studio 14 2015 - PLATFORM: Win32 - EXPAT_DLL: libexpatd.dll - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - # Visual Studio 2015 Win32 XML_UNICODE_WCHAR_T - - GENERATOR: Visual Studio 14 2015 - PLATFORM: Win32 - CMAKE_ARGS: -DEXPAT_CHAR_TYPE=wchar_t - EXPAT_DLL: libexpatwd.dll - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - # Visual Studio 2015 x64 - - GENERATOR: Visual Studio 14 2015 Win64 - PLATFORM: x64 - EXPAT_DLL: libexpatd.dll - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - # Visual Studio 2015 x64 XML_UNICODE_WCHAR_T - - GENERATOR: Visual Studio 14 2015 Win64 - PLATFORM: x64 - CMAKE_ARGS: -DEXPAT_CHAR_TYPE=wchar_t - EXPAT_DLL: libexpatwd.dll - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - # Visual Studio 2017 Win32 - GENERATOR: Visual Studio 15 2017 PLATFORM: Win32 diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt index 241bab04..d6c1618d 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -130,10 +130,10 @@ if(EXPAT_WITH_LIBBSD) endif() if(MSVC) - # Minimum supported MSVC version is 1800 = Visual Studio 12.0/2013 + # Minimum supported MSVC version is 1910 = Visual Studio 15.0/2017 # See also https://cmake.org/cmake/help/latest/variable/MSVC_VERSION.html - if(MSVC_VERSION VERSION_LESS 1800) - message(SEND_ERROR "MSVC_VERSION ${MSVC_VERSION} is not a supported Visual Studio compiler version. Please use Visual Studio 2013 or any later version.") + if(MSVC_VERSION VERSION_LESS 1910) + message(SEND_ERROR "MSVC_VERSION ${MSVC_VERSION} is not a supported Visual Studio compiler version. Please use Visual Studio 15.0/2017 or any later version.") endif() endif() diff --git a/expat/Changes b/expat/Changes index a79d5368..e9b072c7 100644 --- a/expat/Changes +++ b/expat/Changes @@ -15,7 +15,7 @@ Release x.x.xx xxx xxxxxxx xx xxxx #439 xmlwf: Add argument -k to allow continuing after non-fatal errors #439 xmlwf: Add section about exit status to the -h help output - #422 Windows: Drop support for Visual Studio <=11.0/2012 + #422 #447 Windows: Drop support for Visual Studio <=14.0/2015 #382 #428 testrunner: Make verbose mode (argument "-v") report about passed tests, and make default mode report about failures, as well. diff --git a/expat/README.md b/expat/README.md index dd46ce0a..7547cd42 100644 --- a/expat/README.md +++ b/expat/README.md @@ -16,7 +16,7 @@ structures for which you may register handlers. Expat supports the following compilers: - GNU GCC >=4.5 - LLVM Clang >=3.5 -- Microsoft Visual Studio >=12.0/2013 +- Microsoft Visual Studio >=15.0/2017 (rolling `${today} minus 5 years`) Windows users can use the [`expat_win32` package](https://sourceforge.net/projects/expat/files/expat_win32/),