From: Magnus Jacobsson Date: Fri, 23 Oct 2020 10:41:52 +0000 (+0200) Subject: Ensure that Graphviz tools are found first in Windows CMake jobs X-Git-Tag: 2.46.0~20^2^2~13^2~4 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=db22377740bcf300ca3aef6f7e4f9c8885390e1d;p=graphviz 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. --- 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";