Configure vcpkg separately for the apps (#8960)

Author: alexreinking

CMakeLists.txt

@@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 3.28)
 
 # TODO: remove this after updating build bots.
 if (CMAKE_TOOLCHAIN_FILE MATCHES "vcpkg")
-    if (NOT DEFINED VCPKG_OVERLAY_PORTS)
-        set(VCPKG_OVERLAY_PORTS "${CMAKE_CURRENT_LIST_DIR}/cmake/vcpkg")
-    endif ()
-
     if (NOT DEFINED VCPKG_MANIFEST_FEATURES)
         set(VCPKG_MANIFEST_FEATURES developer)
     endif ()

CMakePresets.json

@@ -30,19 +30,9 @@
       "toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
       "cacheVariables": {
         "VCPKG_MANIFEST_FEATURES": "developer",
-        "VCPKG_OVERLAY_PORTS": "${sourceDir}/cmake/vcpkg",
         "Halide_USE_FETCHCONTENT": false
       }
     },
-    {
-      "name": "vcpkg-full",
-      "inherits": "vcpkg",
-      "displayName": "vcpkg deps (all dependencies)",
-      "description": "Build ALL dependencies with vcpkg",
-      "cacheVariables": {
-        "VCPKG_OVERLAY_PORTS": ""
-      }
-    },
     {
       "name": "vs2022",
       "hidden": true,
@@ -93,24 +83,6 @@
       "displayName": "Release (vcpkg)",
       "description": "Release build for a single-config generator, vcpkg dependencies"
     },
-    {
-      "name": "debug-vcpkg-full",
-      "inherits": [
-        "debug",
-        "vcpkg-full"
-      ],
-      "displayName": "Debug (vcpkg-full)",
-      "description": "Debug build for a single-config generator, vcpkg-full dependencies"
-    },
-    {
-      "name": "release-vcpkg-full",
-      "inherits": [
-        "release",
-        "vcpkg-full"
-      ],
-      "displayName": "Release (vcpkg-full)",
-      "description": "Release build for a single-config generator, vcpkg-full dependencies"
-    },
     {
       "name": "win32",
       "inherits": "vs2022",
@@ -125,26 +97,6 @@
       "description": "Visual Studio-based x64 build with vcpkg dependencies.",
       "architecture": "x64"
     },
-    {
-      "name": "win32-vcpkg-full",
-      "inherits": [
-        "vcpkg-full",
-        "vs2022"
-      ],
-      "displayName": "Win32 (Visual Studio/vcpkg-full)",
-      "description": "Visual Studio-based Win32 build with vcpkg-full dependencies.",
-      "architecture": "Win32"
-    },
-    {
-      "name": "win64-vcpkg-full",
-      "inherits": [
-        "vcpkg-full",
-        "vs2022"
-      ],
-      "displayName": "Win64 (Visual Studio/vcpkg-full)",
-      "description": "Visual Studio-based x64 build with vcpkg-full dependencies.",
-      "architecture": "x64"
-    },
     {
       "name": "macOS",
       "displayName": "macOS (Apple Clang)",
@@ -169,15 +121,6 @@
       "displayName": "macOS (vcpkg)",
       "description": "macOS build with vcpkg dependencies"
     },
-    {
-      "name": "macOS-vcpkg-full",
-      "inherits": [
-        "macOS",
-        "vcpkg-full"
-      ],
-      "displayName": "macOS (vcpkg-full)",
-      "description": "macOS build with vcpkg-full dependencies"
-    },
     {
       "name": "package",
       "hidden": true,

apps/vcpkg.json

@@ -0,0 +1,25 @@
+{
+  "name": "halide-apps",
+  "version": "22.0.0",
+  "license": "MIT",
+  "supports": "!uwp",
+  "builtin-baseline": "66c0373dc7fca549e5803087b9487edfe3aca0a1",
+  "default-features": [
+    "jit",
+    "serialization"
+  ],
+  "dependencies": [
+    {
+      "name": "cuda",
+      "platform": "(windows & x64 & !uwp & !xbox) | (linux & x64) | (linux & arm64)"
+    },
+    "eigen3",
+    "libjpeg-turbo",
+    "libpng",
+    "openblas",
+    {
+      "name": "opencl",
+      "platform": "(windows & x64 & !uwp & !xbox) | (linux & x64) | (linux & arm64)"
+    }
+  ]
+}

pyproject.toml

@@ -172,6 +172,9 @@ search = "VERSION {current_version}"
 [[tool.tbump.file]]
 src = "vcpkg.json"
 
+[[tool.tbump.file]]
+src = "apps/vcpkg.json"
+
 [[tool.tbump.file]]
 src = "src/runtime/HalideRuntime.h"
 version_template = "{major}"

vcpkg-configuration.json

@@ -0,0 +1,5 @@
+{
+  "overlay-ports": [
+    "cmake/vcpkg"
+  ]
+}

vcpkg.json

@@ -5,10 +5,9 @@
   "homepage": "https://github.com/halide/Halide",
   "license": "MIT",
   "supports": "!uwp",
-  "builtin-baseline": "d567b667adba0e72c5c3931ddbe745b66aa34b73",
+  "builtin-baseline": "66c0373dc7fca549e5803087b9487edfe3aca0a1",
   "default-features": [
-    "jit",
-    "serialization"
+    "jit"
   ],
   "dependencies": [
     {
@@ -29,26 +28,18 @@
   ],
   "features": {
     "developer": {
-      "description": "Include all Halide features to facilitate development",
+      "description": "Dependencies needed to run tests",
       "dependencies": [
+        "libjpeg-turbo",
+        "libpng",
         {
           "name": "halide",
           "default-features": false,
           "features": [
             "python-bindings",
             "serialization",
-            "target-all",
-            "tests",
             "wasm-executor"
           ]
-        },
-        {
-          "name": "llvm",
-          "default-features": false,
-          "features": [
-            "clang-tools-extra",
-            "enable-assertions"
-          ]
         }
       ]
     },
@@ -182,23 +173,6 @@
         }
       ]
     },
-    "tests": {
-      "description": "Include dependencies needed for testing Halide",
-      "dependencies": [
-        {
-          "name": "cuda",
-          "platform": "(windows & x64 & !uwp & !xbox) | (linux & x64) | (linux & arm64)"
-        },
-        "eigen3",
-        "libjpeg-turbo",
-        "libpng",
-        "openblas",
-        {
-          "name": "opencl",
-          "platform": "(windows & x64 & !uwp & !xbox) | (linux & x64) | (linux & arm64)"
-        }
-      ]
-    },
     "wasm-executor": {
       "description": "Include built-in WASM executor",
       "dependencies": [