From 8706fa3939a82975f6e627900f52680de2ddbb49 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Mon, 9 Dec 2019 08:50:34 +0300 Subject: use CMake's install() for predictable paths This will allow to merge the scripts for the two CIs in the future, hopefully. --- .appveyor/build.ps1 | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to '.appveyor/build.ps1') diff --git a/.appveyor/build.ps1 b/.appveyor/build.ps1 index 94918bd..43ed2e8 100644 --- a/.appveyor/build.ps1 +++ b/.appveyor/build.ps1 @@ -1,5 +1,6 @@ param( [string] $BuildDir = $null, + [string] $InstallDir = $null, [string] $ProjectDir = $null, [string] $Platform = $null, [string] $Generator = $null, @@ -37,6 +38,7 @@ function Test-AppVeyor { function Set-AppVeyorDefaults { $script:ProjectDir = $env:APPVEYOR_BUILD_FOLDER $script:BuildDir = 'C:\Projects\build' + $script:InstallDir = 'C:\Projects\install' $script:Generator = switch ($env:APPVEYOR_BUILD_WORKER_IMAGE) { 'Visual Studio 2017' { 'Visual Studio 15 2017' } 'Visual Studio 2019' { 'Visual Studio 16 2019' } @@ -55,6 +57,8 @@ function Build-Project { [Parameter(Mandatory=$true)] [string] $BuildDir, [Parameter(Mandatory=$true)] + [string] $InstallDir, + [Parameter(Mandatory=$true)] [string] $Generator, [Parameter(Mandatory=$true)] [string] $Platform, @@ -74,13 +78,18 @@ function Build-Project { Invoke-Exe { cmake.exe ` -G $Generator -A $Platform ` + -D "CMAKE_INSTALL_PREFIX=$InstallDir" ` -D "BOOST_ROOT=$BoostDir" ` -D "BOOST_LIBRARYDIR=$BoostLibraryDir" ` -D ENABLE_TESTS=ON ` $ProjectDir } - Invoke-Exe { cmake.exe --build . --config $Configuration -- /m } + Invoke-Exe { cmake.exe --build . --config $Configuration --target install -- /m } + + cd $InstallDir + + Invoke-Exe { .\bin\unit_tests.exe --log_level=all } } function Build-ProjectAppVeyor { @@ -93,6 +102,7 @@ function Build-ProjectAppVeyor { Build-Project ` -ProjectDir $script:ProjectDir ` -BuildDir $script:BuildDir ` + -InstallDir $script:InstallDir ` -Generator $script:Generator ` -Platform $script:Platform ` -Configuration $script:Configuration ` -- cgit v1.2.3