From 76d4fc36abac31c9e9b1c548a4415823b2ea4b3c Mon Sep 17 00:00:00 2001 From: Chase Knowlden Date: Mon, 8 Jun 2026 14:04:36 -0400 Subject: [PATCH] [vcpkg-tool-meson] Define the Apple target platforms (#52221) --- ports/vcpkg-tool-meson/vcpkg.json | 2 +- .../vcpkg-tool-meson/vcpkg_configure_meson.cmake | 16 ++++++++++++++-- versions/baseline.json | 2 +- versions/v-/vcpkg-tool-meson.json | 5 +++++ 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/ports/vcpkg-tool-meson/vcpkg.json b/ports/vcpkg-tool-meson/vcpkg.json index ca6e1348e1..5c010bde23 100644 --- a/ports/vcpkg-tool-meson/vcpkg.json +++ b/ports/vcpkg-tool-meson/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vcpkg-tool-meson", "version": "1.9.0", - "port-version": 9, + "port-version": 10, "description": "Meson build system", "homepage": "https://github.com/mesonbuild/meson", "license": "Apache-2.0", diff --git a/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake b/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake index c64b9c4e2f..8d07767875 100644 --- a/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake +++ b/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake @@ -272,12 +272,24 @@ function(z_vcpkg_get_build_and_host_system build_system host_system is_cross) #h string(APPEND host "endian = 'little'\n") if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_TARGET_IS_MINGW OR VCPKG_TARGET_IS_UWP) set(meson_system_name "windows") + elseif(VCPKG_TARGET_IS_APPLE) + set(meson_system_name "darwin") else() string(TOLOWER "${VCPKG_CMAKE_SYSTEM_NAME}" meson_system_name) endif() string(APPEND host "system = '${meson_system_name}'\n") - if(meson_system_name STREQUAL "darwin") - string(APPEND host "subsystem = 'macos'\n") + if(VCPKG_TARGET_IS_APPLE) + if(VCPKG_TARGET_IS_OSX) + string(APPEND host "subsystem = 'macos'\n") + elseif(VCPKG_TARGET_IS_IOS) + string(APPEND host "subsystem = 'ios'\n") + elseif(VCPKG_TARGET_IS_TVOS) + string(APPEND host "subsystem = 'tvos'\n") + elseif(VCPKG_TARGET_IS_WATCHOS) + string(APPEND host "subsystem = 'watchos'\n") + elseif(VCPKG_TARGET_IS_VISIONOS) + string(APPEND host "subsystem = 'visionos'\n") + endif() endif() string(APPEND host "cpu_family = '${host_cpu_fam}'\n") string(APPEND host "cpu = '${host_cpu}'") diff --git a/versions/baseline.json b/versions/baseline.json index 89086a11b9..8dee94a819 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -10594,7 +10594,7 @@ }, "vcpkg-tool-meson": { "baseline": "1.9.0", - "port-version": 9 + "port-version": 10 }, "vcpkg-tool-mozbuild": { "baseline": "4.0.2", diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index 79cfb74851..d6ada7fbe6 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "86a0d388e3e72719eadc392e359ee80f2f8d8a16", + "version": "1.9.0", + "port-version": 10 + }, { "git-tree": "f85c7f81ae0d98611514765992e5a5769d398bde", "version": "1.9.0",