Skip to content

Commit

Permalink
Chocolatey portable packages stored in bin folder
Browse files Browse the repository at this point in the history
- Add missing bin folder to chocolatey path
- Re-add output of cmake version for debuggin
  • Loading branch information
amaitland authored Feb 6, 2019
1 parent 7a9da32 commit 6af10e0
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -325,8 +325,11 @@ try
rm -r CMakeFiles -ErrorAction:SilentlyContinue
Write-Diagnostic "Running cmake"
$cmake_path = "cmake.exe";
if ($env:ChocolateyInstall -And (Test-Path ($env:ChocolateyInstall + "\" + $cmake_path) )){
$cmake_path = $env:ChocolateyInstall + "\" + $cmake_path;
if ($env:ChocolateyInstall -And (Test-Path ($env:ChocolateyInstall + "\bin\" + $cmake_path)))
{
$cmake_path = $env:ChocolateyInstall + "\bin\" + $cmake_path;

&"$cmake_path" --version
}
&"$cmake_path" -LAH -G "$CmakeGenerator$CmakeArch" -DUSE_SANDBOX=Off -DCEF_RUNTIME_LIBRARY_FLAG=/MD .

Expand Down Expand Up @@ -759,4 +762,4 @@ try
catch
{
WriteException $_;
}
}

0 comments on commit 6af10e0

Please sign in to comment.