From 9e9398f90a6c386bbd6ed89714ddb036b2e969eb Mon Sep 17 00:00:00 2001 From: landarwasright <266587751+landarwasright@users.noreply.github.com> Date: Tue, 2 Jun 2026 19:29:11 -0400 Subject: [PATCH] [vcpkg-tool-meson] Set macOS subsystem in Meson machine files (#52010) Co-authored-by: Neil Hiddink <11198490+neilhiddink@users.noreply.github.com> Co-authored-by: Victor Romero --- ports/vcpkg-tool-meson/vcpkg.json | 2 +- ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake | 4 ++++ scripts/cmake/vcpkg_configure_meson.cmake | 4 ++++ versions/baseline.json | 2 +- versions/v-/vcpkg-tool-meson.json | 5 +++++ 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ports/vcpkg-tool-meson/vcpkg.json b/ports/vcpkg-tool-meson/vcpkg.json index 8b52e93147..ca6e1348e1 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": 8, + "port-version": 9, "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 117adee747..c64b9c4e2f 100644 --- a/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake +++ b/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake @@ -214,6 +214,7 @@ function(z_vcpkg_get_build_and_host_system build_system host_system is_cross) #h string(APPEND build "system = 'windows'\n") elseif(CMAKE_HOST_APPLE) string(APPEND build "system = 'darwin'\n") + string(APPEND build "subsystem = 'macos'\n") elseif(CYGWIN) string(APPEND build "system = 'cygwin'\n") elseif(CMAKE_HOST_UNIX) @@ -275,6 +276,9 @@ function(z_vcpkg_get_build_and_host_system build_system host_system is_cross) #h 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") + endif() string(APPEND host "cpu_family = '${host_cpu_fam}'\n") string(APPEND host "cpu = '${host_cpu}'") if(NOT host_unkown) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index c716f6cd49..acbeb1b5b0 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -201,6 +201,7 @@ function(z_vcpkg_get_build_and_host_system build_system host_system is_cross) #h string(APPEND build "system = 'windows'\n") elseif(CMAKE_HOST_APPLE) string(APPEND build "system = 'darwin'\n") + string(APPEND build "subsystem = 'macos'\n") elseif(VCPKG_HOST_IS_CYGWIN) string(APPEND build "system = 'cygwin'\n") elseif(CMAKE_HOST_UNIX) @@ -256,6 +257,9 @@ function(z_vcpkg_get_build_and_host_system build_system host_system is_cross) #h 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") + endif() string(APPEND host "cpu_family = '${host_cpu_fam}'\n") string(APPEND host "cpu = '${host_cpu}'") if(NOT host_unkown) diff --git a/versions/baseline.json b/versions/baseline.json index 25ec34fe3c..69df379387 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -10586,7 +10586,7 @@ }, "vcpkg-tool-meson": { "baseline": "1.9.0", - "port-version": 8 + "port-version": 9 }, "vcpkg-tool-mozbuild": { "baseline": "4.0.2", diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index 3d475c7005..79cfb74851 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f85c7f81ae0d98611514765992e5a5769d398bde", + "version": "1.9.0", + "port-version": 9 + }, { "git-tree": "6ac36671b3020549d60c900eff3140bc36403936", "version": "1.9.0",