Skip to content

Commit 5f42b49

Browse files
committed
Tighten up default features, restore developer feature, and drop "full" vcpkg presets
1 parent a89a9f2 commit 5f42b49

File tree

3 files changed

+22
-61
lines changed

3 files changed

+22
-61
lines changed

CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
cmake_minimum_required(VERSION 3.28)
22

3+
# TODO: remove this after updating build bots.
34
if (CMAKE_TOOLCHAIN_FILE MATCHES "vcpkg")
5+
if (NOT DEFINED VCPKG_MANIFEST_FEATURES)
6+
set(VCPKG_MANIFEST_FEATURES developer)
7+
endif ()
8+
49
# vcpkg and FetchContent are incompatible
510
set(Halide_USE_FETCHCONTENT OFF)
611
endif ()

CMakePresets.json

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,9 @@
3030
"toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
3131
"cacheVariables": {
3232
"VCPKG_MANIFEST_FEATURES": "developer",
33-
"VCPKG_OVERLAY_PORTS": "${sourceDir}/cmake/vcpkg",
3433
"Halide_USE_FETCHCONTENT": false
3534
}
3635
},
37-
{
38-
"name": "vcpkg-full",
39-
"inherits": "vcpkg",
40-
"displayName": "vcpkg deps (all dependencies)",
41-
"description": "Build ALL dependencies with vcpkg",
42-
"cacheVariables": {
43-
"VCPKG_OVERLAY_PORTS": ""
44-
}
45-
},
4636
{
4737
"name": "vs2022",
4838
"hidden": true,
@@ -93,24 +83,6 @@
9383
"displayName": "Release (vcpkg)",
9484
"description": "Release build for a single-config generator, vcpkg dependencies"
9585
},
96-
{
97-
"name": "debug-vcpkg-full",
98-
"inherits": [
99-
"debug",
100-
"vcpkg-full"
101-
],
102-
"displayName": "Debug (vcpkg-full)",
103-
"description": "Debug build for a single-config generator, vcpkg-full dependencies"
104-
},
105-
{
106-
"name": "release-vcpkg-full",
107-
"inherits": [
108-
"release",
109-
"vcpkg-full"
110-
],
111-
"displayName": "Release (vcpkg-full)",
112-
"description": "Release build for a single-config generator, vcpkg-full dependencies"
113-
},
11486
{
11587
"name": "win32",
11688
"inherits": "vs2022",
@@ -125,26 +97,6 @@
12597
"description": "Visual Studio-based x64 build with vcpkg dependencies.",
12698
"architecture": "x64"
12799
},
128-
{
129-
"name": "win32-vcpkg-full",
130-
"inherits": [
131-
"vcpkg-full",
132-
"vs2022"
133-
],
134-
"displayName": "Win32 (Visual Studio/vcpkg-full)",
135-
"description": "Visual Studio-based Win32 build with vcpkg-full dependencies.",
136-
"architecture": "Win32"
137-
},
138-
{
139-
"name": "win64-vcpkg-full",
140-
"inherits": [
141-
"vcpkg-full",
142-
"vs2022"
143-
],
144-
"displayName": "Win64 (Visual Studio/vcpkg-full)",
145-
"description": "Visual Studio-based x64 build with vcpkg-full dependencies.",
146-
"architecture": "x64"
147-
},
148100
{
149101
"name": "macOS",
150102
"displayName": "macOS (Apple Clang)",
@@ -169,15 +121,6 @@
169121
"displayName": "macOS (vcpkg)",
170122
"description": "macOS build with vcpkg dependencies"
171123
},
172-
{
173-
"name": "macOS-vcpkg-full",
174-
"inherits": [
175-
"macOS",
176-
"vcpkg-full"
177-
],
178-
"displayName": "macOS (vcpkg-full)",
179-
"description": "macOS build with vcpkg-full dependencies"
180-
},
181124
{
182125
"name": "package",
183126
"hidden": true,

vcpkg.json

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77
"supports": "!uwp",
88
"builtin-baseline": "66c0373dc7fca549e5803087b9487edfe3aca0a1",
99
"default-features": [
10-
"jit",
11-
"python-bindings",
12-
"serialization",
13-
"wasm-executor"
10+
"jit"
1411
],
1512
"dependencies": [
1613
{
@@ -30,6 +27,22 @@
3027
"vulkan-headers"
3128
],
3229
"features": {
30+
"developer": {
31+
"description": "Dependencies needed to run tests",
32+
"dependencies": [
33+
"libjpeg-turbo",
34+
"libpng",
35+
{
36+
"name": "halide",
37+
"default-features": false,
38+
"features": [
39+
"python-bindings",
40+
"serialization",
41+
"wasm-executor"
42+
]
43+
}
44+
]
45+
},
3346
"jit": {
3447
"description": "Include targets needed to compile for the library architecture",
3548
"dependencies": [

0 commit comments

Comments
 (0)