Skip to content

Commit 1dc399b

Browse files
committed
chore: Use vcpkg instead of conan in the MSVC build.
1 parent 14d8231 commit 1dc399b

File tree

3 files changed

+31
-108
lines changed

3 files changed

+31
-108
lines changed

CMakePresets.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"cacheVariables": {
88
"ENABLE_SHARED": true,
99
"ENABLE_STATIC": true,
10+
"FLAT_OUTPUT_STRUCTURE": true,
1011
"AUTOTEST": true,
1112
"BUILD_MISC_TESTS": true,
1213
"BOOTSTRAP_DAEMON": false,
@@ -17,5 +18,19 @@
1718
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
1819
}
1920
}
21+
],
22+
"buildPresets": [
23+
{
24+
"name": "windows-default",
25+
"configurePreset": "windows-default",
26+
"description": "Build for Windows using default settings"
27+
}
28+
],
29+
"testPresets": [
30+
{
31+
"name": "windows-default",
32+
"configurePreset": "windows-default",
33+
"description": "Run tests for Windows using default settings"
34+
}
2035
]
2136
}

azure-pipelines.yml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
11
pool:
22
vmImage: "windows-2019"
33
jobs:
4-
- job: "windows_msvc_conan"
4+
- job: "vcpkg"
55
strategy:
66
matrix:
77
static:
8-
conan.shared: "False"
8+
ENABLE_STATIC: "ON"
9+
ENABLE_SHARED: "OFF"
910
shared:
10-
conan.shared: "True"
11+
ENABLE_STATIC: "OFF"
12+
ENABLE_SHARED: "ON"
1113
steps:
12-
- bash: choco install pkgconfiglite
13-
displayName: "Install pkg-config"
14-
- bash: python -m pip install conan
15-
displayName: "Install Conan"
14+
- task: Cache@2
15+
inputs:
16+
key: "vcpkg"
17+
path: "_build/vcpkg_installed"
1618
- bash: git submodule update --init --recursive
17-
displayName: "Fetch git submodules"
18-
- bash: conan profile detect
19-
displayName: "Detect Conan profile"
20-
- bash: conan build -o "&:with_tests=True" -o "&:shared=$(conan.shared)" .
21-
displayName: "Build with Conan"
19+
- bash: cmake --preset windows-default -DENABLE_STATIC=$(ENABLE_STATIC) -DENABLE_SHARED=$(ENABLE_SHARED)
20+
env:
21+
VCPKG_ROOT: "C:/vcpkg"
22+
VCPKG_DEFAULT_TRIPLET: "x64-windows"
23+
- bash: cmake --build _build --config Release
24+
- bash: ctest --preset windows-default -C Release --parallel 50 ||
25+
ctest --preset windows-default -C Release --rerun-failed --output-on-failure

conanfile.py

Lines changed: 0 additions & 96 deletions
This file was deleted.

0 commit comments

Comments
 (0)