aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hahler <git@thequod.de>2019-07-27 11:55:17 +0200
committerGitHub <noreply@github.com>2019-07-27 11:55:17 +0200
commit997601d966dcc7b10c11eaae9c31bce2441c86da (patch)
tree351a79ee1d1e6ae47ea0336983602398b9dea923
parent7be85ed0f58cc2a7f61f24002c55fac335508079 (diff)
downloadrneovim-997601d966dcc7b10c11eaae9c31bce2441c86da.tar.gz
rneovim-997601d966dcc7b10c11eaae9c31bce2441c86da.tar.bz2
rneovim-997601d966dcc7b10c11eaae9c31bce2441c86da.zip
ci: AppVeyor: DEPS_BUILD_DIR is not a CMake variable [ci skip] (#10613)
Fixes: > CMake Warning: > Manually-specified variables were not used by the project: > > DEPS_BUILD_DIR
-rw-r--r--ci/build.ps114
1 files changed, 8 insertions, 6 deletions
diff --git a/ci/build.ps1 b/ci/build.ps1
index 5f0f0de218..da1ad2f4b6 100644
--- a/ci/build.ps1
+++ b/ci/build.ps1
@@ -14,9 +14,11 @@ $depsCmakeVars = @{
$nvimCmakeVars = @{
CMAKE_BUILD_TYPE = $cmakeBuildType;
BUSTED_OUTPUT_TYPE = 'nvim';
- DEPS_BUILD_DIR=$(if ($env:DEPS_BUILD_DIR -ne $null) {$env:DEPS_BUILD_DIR} else {".deps"});
DEPS_PREFIX=$(if ($env:DEPS_PREFIX -ne $null) {$env:DEPS_PREFIX} else {".deps/usr"});
}
+if ($env:DEPS_BUILD_DIR -eq $null) {
+ $env:DEPS_BUILD_DIR = ".deps";
+}
$uploadToCodeCov = $false
function exitIfFailed() {
@@ -26,11 +28,11 @@ function exitIfFailed() {
}
}
-if (-Not (Test-Path -PathType container $nvimCmakeVars["DEPS_BUILD_DIR"])) {
- write-host "cache dir not found: $($nvimCmakeVars['DEPS_BUILD_DIR'])"
- mkdir $nvimCmakeVars["DEPS_BUILD_DIR"]
+if (-Not (Test-Path -PathType container $env:DEPS_BUILD_DIR)) {
+ write-host "cache dir not found: $($env:DEPS_BUILD_DIR)"
+ mkdir $env:DEPS_BUILD_DIR
} else {
- write-host "cache dir $($nvimCmakeVars['DEPS_BUILD_DIR']) size: $(Get-ChildItem $nvimCmakeVars['DEPS_BUILD_DIR'] -recurse | Measure-Object -property length -sum | Select -expand sum)"
+ write-host "cache dir $($env:DEPS_BUILD_DIR) size: $(Get-ChildItem $env:DEPS_BUILD_DIR -recurse | Measure-Object -property length -sum | Select -expand sum)"
}
if ($compiler -eq 'MINGW') {
@@ -96,7 +98,7 @@ function convertToCmakeArgs($vars) {
return $vars.GetEnumerator() | foreach { "-D$($_.Key)=$($_.Value)" }
}
-cd $nvimCmakeVars["DEPS_BUILD_DIR"]
+cd $env:DEPS_BUILD_DIR
cmake -G $cmakeGenerator $(convertToCmakeArgs($depsCmakeVars)) "$buildDir/third-party/" ; exitIfFailed
cmake --build . --config $cmakeBuildType -- $cmakeGeneratorArgs ; exitIfFailed
cd $buildDir