summaryrefslogtreecommitdiff
path: root/appveyor.yml
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhsoting.net>2022-01-09 19:04:04 +0100
committerJörg Frings-Fürst <debian@jff-webhsoting.net>2022-01-09 19:04:04 +0100
commit846d3dbadb663cfddc2b35dbfff836779a4b1b79 (patch)
tree1c109543808e40e553cfea44f1329bd410f743ff /appveyor.yml
parentd336d9867cfdbf1683653de369d67f5c7bea3f5e (diff)
parentf308d3149d855c4d6d0251cf6bce393dfa371329 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'appveyor.yml')
-rw-r--r--appveyor.yml18
1 files changed, 15 insertions, 3 deletions
diff --git a/appveyor.yml b/appveyor.yml
index 7e36cdb..ec111fa 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -41,7 +41,7 @@ configuration:
# - Release
environment:
- GTEST_VERSION: 1.8.1
+ GTEST_VERSION: 1.10.0
# https://www.appveyor.com/docs/windows-images-software/
matrix:
@@ -65,6 +65,16 @@ environment:
CMAKE_GENERATOR: Visual Studio 15 2017 Win64
PLATFORM: x64
+ # Visual Studio 2019, 32 bit
+ - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+ CMAKE_GENERATOR: Visual Studio 16 2019
+ COMMON_CMAKE_ARGS: -A Win32
+
+ # Visual Studio 2019, 64 bit
+ - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+ CMAKE_GENERATOR: Visual Studio 16 2019
+ COMMON_CMAKE_ARGS: -A x64
+
before_build:
- curl -fsSL -o release-%GTEST_VERSION%.zip https://github.com/google/googletest/archive/release-%GTEST_VERSION%.zip
- unzip -q release-%GTEST_VERSION%.zip
@@ -72,12 +82,13 @@ before_build:
- cmake
-G "%CMAKE_GENERATOR%"
-DCVF_VERSION=%GTEST_VERSION%
+ %COMMON_CMAKE_ARGS%
.
- cmake --build . --config Release -- /m
# BEGIN Enrich folder to make FindGTest.cmake happy
- md googletest\lib
- - copy googlemock\gtest\Release\gtest.lib googletest\lib
- - copy googlemock\gtest\Release\gtest_main.lib googletest\lib
+ - copy lib\Release\gtest.lib googletest\lib
+ - copy lib\Release\gtest_main.lib googletest\lib
# END
- cd ..
- mkdir build
@@ -89,6 +100,7 @@ before_build:
-DURIPARSER_BUILD_DOCS=OFF
-DURIPARSER_MSVC_RUNTIME=/MT
-DURIPARSER_WARNINGS_AS_ERRORS=ON
+ %COMMON_CMAKE_ARGS%
..
build: