Skip to content

Update version and libs #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
metsma wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update version and libs #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ jobs:
echo "ANDROID_NDK_HOME=$ANDROID_NDK_LATEST_HOME" >> "$GITHUB_ENV"
echo "ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME" >> "$GITHUB_ENV"
echo "VCPKG_ROOT=$VCPKG_INSTALLATION_ROOT" >> "$GITHUB_ENV"
git -C $VCPKG_INSTALLATION_ROOT fetch origin f77737496dabd44c63ecc599dc0f4d6cff30d0d5
git -C $VCPKG_INSTALLATION_ROOT reset --hard f77737496dabd44c63ecc599dc0f4d6cff30d0d5
- name: Cache vcpkg
uses: actions/cache@v5
with:
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ if(POLICY CMP0167)
cmake_policy(SET CMP0167 NEW)
endif()

project(libcdoc VERSION 0.5.0)
project(libcdoc VERSION 0.5.1)

macro(SET_ENV NAME DEF)
if(DEFINED ENV{${NAME}})
Expand Down
18 changes: 10 additions & 8 deletions build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ param(
[string]$platform = "x64",
[string]$build_number = $(if ($null -eq $env:BUILD_NUMBER) {"0"} else {$env:BUILD_NUMBER}),
[string]$git = "git.exe",
[string]$vcpkg = "vcpkg\vcpkg.exe",
[string]$vcpkg_dir = (split-path -parent $vcpkg),
[string]$vcpkg_installed = $libcdoc,
[string]$vcpkg_triplet = "x64-windows",
[string]$vcpkg_installed_platform = "$vcpkg_installed\vcpkg_installed",
[string]$vcpkg = $env:VCPKG_ROOT,
[string]$vcpkg_installed = $null,
[string]$vcpkg_installed_platform = $(if($vcpkg_installed) { "$vcpkg_installed\vcpkg_installed_$platform" } else { "$libdigidocpp\build\windows-$platform\vcpkg_installed" }),
[string]$vcpkg_triplet = "$platform-windows",
[string]$cmake = "cmake.exe",
[string]$generator = "Visual Studio 17 2022",
[switch]$RunTests = $false,
)

if(!(Test-Path -Path $vcpkg)) {
& $git clone https://github.com/microsoft/vcpkg.git $vcpkg_dir
& $vcpkg_dir\bootstrap-vcpkg.bat
$vcpkg = "$libdigidocpp\vcpkg"
& $git clone https://github.com/microsoft/vcpkg $vcpkg
& $vcpkg\bootstrap-vcpkg.bat
}

$cmakeext = @()
Expand All @@ -29,9 +29,11 @@ if($RunTests) {
}

$buildpath = "build"
$env:PLATFORM = $platform
$env:VCPKG_ROOT = $vcpkg

& $cmake --fresh -B $buildpath -S . "-G$generator" $cmakeext `
"--toolchain $vcpkg_dir/scripts/buildsystems/vcpkg.cmake" `
"--toolchain $vcpkg/scripts/buildsystems/vcpkg.cmake" `
"-DVCPKG_INSTALLED_DIR=$vcpkg_installed_platform" `
"-DVCPKG_TARGET_TRIPLET=$vcpkg_triplet"

Expand Down
4 changes: 2 additions & 2 deletions vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
"features": {
"tests": { "description": "Build tests", "dependencies": ["boost-test"] }
},
"builtin-baseline": "bc38a15b0bee8bc48a49ea267cc32fbb49aedfc4",
"builtin-baseline": "f77737496dabd44c63ecc599dc0f4d6cff30d0d5",
"vcpkg-configuration": {
"overlay-triplets": ["./vcpkg-triplets"],
"registries": [
{
"kind": "git",
"repository": "https://github.com/open-eid/vcpkg-ports",
"reference": "vcpkg-registry",
"baseline": "316f4d642f489b7d23d97891ed73431e7394d749",
"baseline": "e841c32c534b9db3130a824992f4bacd79fae1bc",
"packages": ["openssl"]
}
]
Expand Down
Loading