From db22377740bcf300ca3aef6f7e4f9c8885390e1d Mon Sep 17 00:00:00 2001
From: Magnus Jacobsson <magnus.jacobsson@berotec.se>
Date: Fri, 23 Oct 2020 12:41:52 +0200
Subject: [PATCH] Ensure that Graphviz tools are found first in Windows CMake
jobs
Prepend Graphviz bin directory to path instead of appending it.
The tools test found
C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x86\gc.exe
before Graphviz gc.
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 26d42e2a6..00dc0b46b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -139,7 +139,7 @@ portable-source:
# will then fail because the install hasn't finished)
./graphviz-install.exe /S /D=$env:graphviz_install_dir | Out-Null;
mv graphviz-install.exe graphviz-install-$Env:GV_VERSION-$API.exe;
- $env:Path += ";" + $env:graphviz_install_dir + "\bin"
+ $env:Path = $env:graphviz_install_dir + "\bin" + ";" + $env:Path
cd ..;
$Env:INCLUDE += ";C:\Graphviz\include";
$Env:LIB += ";C:\Graphviz\lib";
--
2.40.0