diff options
| -rw-r--r-- | .appveyor/build.ps1 | 27 | ||||
| -rw-r--r-- | appveyor.yml | 29 |
2 files changed, 30 insertions, 26 deletions
diff --git a/.appveyor/build.ps1 b/.appveyor/build.ps1 index ea80b10..94918bd 100644 --- a/.appveyor/build.ps1 +++ b/.appveyor/build.ps1 @@ -34,39 +34,18 @@ function Test-AppVeyor { return Test-Path env:APPVEYOR } -function Format-AppVeyorBoostDir { - return "boost_" + $env:appveyor_boost_version.replace('.', '_') -} - -function Get-AppVeyorBoostDir { - return "C:\Libraries\$(Format-AppVeyorBoostDir)" -} - -function Get-AppVeyorBoostLibraryDir { - param( - [string] $Platform = $env:PLATFORM - ) - - $BoostDir = Get-AppVeyorBoostDir - - if ($Platform -eq 'x64') { - return "$BoostDir\lib64-msvc-14.2" - } else { - return "$BoostDir\lib32-msvc-14.2" - } -} - function Set-AppVeyorDefaults { $script:ProjectDir = $env:APPVEYOR_BUILD_FOLDER $script:BuildDir = 'C:\Projects\build' $script:Generator = switch ($env:APPVEYOR_BUILD_WORKER_IMAGE) { + 'Visual Studio 2017' { 'Visual Studio 15 2017' } 'Visual Studio 2019' { 'Visual Studio 16 2019' } default { throw "Unsupported AppVeyor image: $env:APPVEYOR_BUILD_WORKER_IMAGE" } } $script:Platform = $env:PLATFORM $script:Configuration = $env:CONFIGURATION - $script:BoostDir = Get-AppVeyorBoostDir - $script:BoostLibraryDir = Get-AppVeyorBoostLibraryDir -Platform $script:Platform + $script:BoostDir = $env:appveyor_boost_root + $script:BoostLibraryDir = $env:appveyor_boost_librarydir } function Build-Project { diff --git a/appveyor.yml b/appveyor.yml index a575963..f3701fe 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,8 @@ version: '{build}' -image: Visual Studio 2019 +image: + - Visual Studio 2017 + - Visual Studio 2019 platform: - Win32 @@ -22,6 +24,29 @@ test_script: for: - matrix: only: + - image: Visual Studio 2017 + platform: Win32 + environment: + appveyor_boost_root: C:\Libraries\boost_1_69_0 + appveyor_boost_librarydir: C:\Libraries\boost_1_69_0\lib32-msvc-14.1 +- matrix: + only: + - image: Visual Studio 2017 + platform: x64 + environment: + appveyor_boost_root: C:\Libraries\boost_1_69_0 + appveyor_boost_librarydir: C:\Libraries\boost_1_69_0\lib64-msvc-14.1 +- matrix: + only: + - image: Visual Studio 2019 + platform: Win32 + environment: + appveyor_boost_root: C:\Libraries\boost_1_71_0 + appveyor_boost_librarydir: C:\Libraries\boost_1_71_0\lib32-msvc-14.2 +- matrix: + only: - image: Visual Studio 2019 + platform: x64 environment: - appveyor_boost_version: 1.71.0 + appveyor_boost_root: C:\Libraries\boost_1_71_0 + appveyor_boost_librarydir: C:\Libraries\boost_1_71_0\lib64-msvc-14.2 |