Skip to content
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.

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

chore: Use vcpkg instead of conan in the MSVC build. #2797

Merged
merged 1 commit into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 15 additions & 0 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"cacheVariables": {
"ENABLE_SHARED": true,
"ENABLE_STATIC": true,
"FLAT_OUTPUT_STRUCTURE": true,
"AUTOTEST": true,
"BUILD_MISC_TESTS": true,
"BOOTSTRAP_DAEMON": false,
Expand All @@ -17,5 +18,19 @@
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
}
}
],
"buildPresets": [
{
"name": "windows-default",
"configurePreset": "windows-default",
"description": "Build for Windows using default settings"
}
],
"testPresets": [
{
"name": "windows-default",
"configurePreset": "windows-default",
"description": "Run tests for Windows using default settings"
}
]
}
28 changes: 16 additions & 12 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
pool:
vmImage: "windows-2019"
jobs:
- job: "windows_msvc_conan"
- job: "vcpkg"
strategy:
matrix:
static:
conan.shared: "False"
ENABLE_STATIC: "ON"
ENABLE_SHARED: "OFF"
shared:
conan.shared: "True"
ENABLE_STATIC: "OFF"
ENABLE_SHARED: "ON"
steps:
- bash: choco install pkgconfiglite
displayName: "Install pkg-config"
- bash: python -m pip install conan
displayName: "Install Conan"
- task: Cache@2
inputs:
key: "vcpkg"
path: "_build/vcpkg_installed"
- bash: git submodule update --init --recursive
displayName: "Fetch git submodules"
- bash: conan profile detect
displayName: "Detect Conan profile"
- bash: conan build -o "&:with_tests=True" -o "&:shared=$(conan.shared)" .
displayName: "Build with Conan"
- bash: cmake --preset windows-default -DENABLE_STATIC=$(ENABLE_STATIC) -DENABLE_SHARED=$(ENABLE_SHARED)
env:
VCPKG_ROOT: "C:/vcpkg"
VCPKG_DEFAULT_TRIPLET: "x64-windows"
- bash: cmake --build _build --config Release
- bash: ctest --preset windows-default -C Release --parallel 50 ||
ctest --preset windows-default -C Release --rerun-failed --output-on-failure
96 changes: 0 additions & 96 deletions conanfile.py

This file was deleted.

Loading