Skip to content

Commit

Permalink
Add vcpkg root
Browse files Browse the repository at this point in the history
  • Loading branch information
thomas-creel committed May 20, 2024
1 parent 83c0731 commit 3614047
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/untrustedPR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
run: |
git config user.email github-actions
git config user.name [email protected]
unset VCPKG_ROOT
git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*portfile.cmake' | sed 's/[MAR]\t*//' | while read filename; do grep -q -E '(vcpkg_install_cmake|vcpkg_build_cmake|vcpkg_configure_cmake|vcpkg_fixup_cmake_targets)' "$filename" && echo " - \`$filename\`" || true; done > .github-pr.deprecated-cmake
git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*vcpkg.json' | sed 's/[MAR]\t*//' | while read filename; do grep -q -E '"license": ' "$filename" || echo " - \`$filename\`" || true; done > .github-pr.missing-license
./vcpkg format-manifest --all --convert-control
Expand Down
4 changes: 2 additions & 2 deletions build-vcpkg.ps1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$ErrorActionPreference = "Stop"

function Invoke-VcpkgBuild($pkg) {
.\vcpkg.exe install $pkg`:x64-windows-mixed
.\vcpkg.exe install $pkg`:x64-windows-mixed --vcpkg-root .
if ($LastExitCode -ne 0) { throw }
}

Expand Down Expand Up @@ -35,5 +35,5 @@ Invoke-VcpkgBuild "gtest"

# export created libraries and set version
.\vcpkg.exe export --x-all-installed --raw
Move-Item -Path .\vcpkg-export-* -Destination .\vcpkg
Move-Item -Path .\vcpkg-export-* -Destination .\vcpkg --vcpkg-root .
Write-Output 16 > vcpkg\installed\version.txt

0 comments on commit 3614047

Please sign in to comment.