AppVeyor: Improve use of CMake

diff --git a/appveyor.yml b/appveyor.yml
index c332ad4874ce52883778e7ceeeb930880a0ce25e..a568ec7470446c7be75b2cd42f872e84e0d8ac8c 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -54,122 +54,142 @@ environment:
     # Visual Studio 2010 Win32
     - GENERATOR: Visual Studio 10 2010
       PLATFORM: Win32
+      EXPAT_DLL: expatd.dll
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
 
     # Visual Studio 2010 Win32 XML_UNICODE_WCHAR_T
     - GENERATOR: Visual Studio 10 2010
       PLATFORM: Win32
-      CFLAGS: -DXML_UNICODE -DXML_UNICODE_WCHAR_T
+      CMAKE_ARGS: -DEXPAT_UNICODE=ON -DEXPAT_UNICODE_WCHAR_T=ON
+      EXPAT_DLL: expatwd.dll
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
 
     # Visual Studio 2010 x64
     - GENERATOR: Visual Studio 10 2010 Win64
       PLATFORM: x64
+      EXPAT_DLL: expatd.dll
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
 
     # Visual Studio 2010 x64 XML_UNICODE_WCHAR_T
     - GENERATOR: Visual Studio 10 2010 Win64
       PLATFORM: x64
-      CFLAGS: -DXML_UNICODE -DXML_UNICODE_WCHAR_T
+      CMAKE_ARGS: -DEXPAT_UNICODE=ON -DEXPAT_UNICODE_WCHAR_T=ON
+      EXPAT_DLL: expatwd.dll
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
 
     # Visual Studio 2012 Win32
     - GENERATOR: Visual Studio 11 2012
       PLATFORM: Win32
+      EXPAT_DLL: expatd.dll
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
 
     # Visual Studio 2012 Win32 XML_UNICODE_WCHAR_T
     - GENERATOR: Visual Studio 11 2012
       PLATFORM: Win32
-      CFLAGS: -DXML_UNICODE -DXML_UNICODE_WCHAR_T
+      CMAKE_ARGS: -DEXPAT_UNICODE=ON -DEXPAT_UNICODE_WCHAR_T=ON
+      EXPAT_DLL: expatwd.dll
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
 
     # Visual Studio 2012 x64
     - GENERATOR: Visual Studio 11 2012 Win64
       PLATFORM: x64
+      EXPAT_DLL: expatd.dll
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
 
     # Visual Studio 2012 x64 XML_UNICODE_WCHAR_T
     - GENERATOR: Visual Studio 11 2012 Win64
       PLATFORM: x64
-      CFLAGS: -DXML_UNICODE -DXML_UNICODE_WCHAR_T
+      CMAKE_ARGS: -DEXPAT_UNICODE=ON -DEXPAT_UNICODE_WCHAR_T=ON
+      EXPAT_DLL: expatwd.dll
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
 
     # Visual Studio 2013 Win32
     - GENERATOR: Visual Studio 12 2013
       PLATFORM: Win32
+      EXPAT_DLL: expatd.dll
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
 
     # Visual Studio 2013 Win32 XML_UNICODE_WCHAR_T
     - GENERATOR: Visual Studio 12 2013
       PLATFORM: Win32
-      CFLAGS: -DXML_UNICODE -DXML_UNICODE_WCHAR_T
+      CMAKE_ARGS: -DEXPAT_UNICODE=ON -DEXPAT_UNICODE_WCHAR_T=ON
+      EXPAT_DLL: expatwd.dll
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
 
     # Visual Studio 2013 x64
     - GENERATOR: Visual Studio 12 2013 Win64
       PLATFORM: x64
+      EXPAT_DLL: expatd.dll
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
 
     # Visual Studio 2013 x64 XML_UNICODE_WCHAR_T
     - GENERATOR: Visual Studio 12 2013 Win64
       PLATFORM: x64
-      CFLAGS: -DXML_UNICODE -DXML_UNICODE_WCHAR_T
+      CMAKE_ARGS: -DEXPAT_UNICODE=ON -DEXPAT_UNICODE_WCHAR_T=ON
+      EXPAT_DLL: expatwd.dll
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
 
     # Visual Studio 2015 Win32
     - GENERATOR: Visual Studio 14 2015
       PLATFORM: Win32
+      EXPAT_DLL: expatd.dll
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
 
     # Visual Studio 2015 Win32 XML_UNICODE_WCHAR_T
     - GENERATOR: Visual Studio 14 2015
       PLATFORM: Win32
-      CFLAGS: -DXML_UNICODE -DXML_UNICODE_WCHAR_T
+      CMAKE_ARGS: -DEXPAT_UNICODE=ON -DEXPAT_UNICODE_WCHAR_T=ON
+      EXPAT_DLL: expatwd.dll
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
 
     # Visual Studio 2015 x64
     - GENERATOR: Visual Studio 14 2015 Win64
       PLATFORM: x64
+      EXPAT_DLL: expatd.dll
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
 
     # Visual Studio 2015 x64 XML_UNICODE_WCHAR_T
     - GENERATOR: Visual Studio 14 2015 Win64
       PLATFORM: x64
-      CFLAGS: -DXML_UNICODE -DXML_UNICODE_WCHAR_T
+      CMAKE_ARGS: -DEXPAT_UNICODE=ON -DEXPAT_UNICODE_WCHAR_T=ON
+      EXPAT_DLL: expatwd.dll
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
 
     # Visual Studio 2017 Win32
     - GENERATOR: Visual Studio 15 2017
       PLATFORM: Win32
+      EXPAT_DLL: expatd.dll
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
 
     # Visual Studio 2017 Win32 XML_UNICODE_WCHAR_T
     - GENERATOR: Visual Studio 15 2017
       PLATFORM: Win32
-      CFLAGS: -DXML_UNICODE -DXML_UNICODE_WCHAR_T
+      CMAKE_ARGS: -DEXPAT_UNICODE=ON -DEXPAT_UNICODE_WCHAR_T=ON
+      EXPAT_DLL: expatwd.dll
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
 
     # Visual Studio 2017 x64
     - GENERATOR: Visual Studio 15 2017 Win64
       PLATFORM: x64
+      EXPAT_DLL: expatd.dll
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
 
     # Visual Studio 2017 x64 XML_UNICODE_WCHAR_T
     - GENERATOR: Visual Studio 15 2017 Win64
       PLATFORM: x64
-      CFLAGS: -DXML_UNICODE -DXML_UNICODE_WCHAR_T
+      CMAKE_ARGS: -DEXPAT_UNICODE=ON -DEXPAT_UNICODE_WCHAR_T=ON
+      EXPAT_DLL: expatwd.dll
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
 
 before_build:
   - echo Running cmake...
   - cd c:\projects\libexpat
-  - cmake -DEXPAT_WARNINGS_AS_ERRORS=ON -G"%GENERATOR%" expat
+  - cmake -G"%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DEXPAT_WARNINGS_AS_ERRORS=ON %CMAKE_ARGS% expat
 
 build:
   parallel: true                  # enable MSBuild parallel builds
   project: expat.sln              # path to Visual Studio solution or project
 
 test_script:
-  - cp Debug\expatd.dll tests\Debug
-  - tests\Debug\runtests.exe
+  - cp %CONFIGURATION%\\%EXPAT_DLL% tests\\%CONFIGURATION%\\
+  - ctest --build-config %CONFIGURATION% --output-on-failure --parallel 2