Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[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 <romerosanchezv@gmail.com>
This commit is contained in:
landarwasright 2026-06-02 19:29:11 -04:00 committed by GitHub
parent 1defe6684f
commit 9e9398f90a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/vcpkg-tool-meson/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "vcpkg-tool-meson", "name": "vcpkg-tool-meson",
"version": "1.9.0", "version": "1.9.0",
"port-version": 8, "port-version": 9,
"description": "Meson build system", "description": "Meson build system",
"homepage": "https://github.com/mesonbuild/meson", "homepage": "https://github.com/mesonbuild/meson",
"license": "Apache-2.0", "license": "Apache-2.0",

4
ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake
View File

@ -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") string(APPEND build "system = 'windows'\n")
elseif(CMAKE_HOST_APPLE) elseif(CMAKE_HOST_APPLE)
string(APPEND build "system = 'darwin'\n") string(APPEND build "system = 'darwin'\n")
string(APPEND build "subsystem = 'macos'\n")
elseif(CYGWIN) elseif(CYGWIN)
string(APPEND build "system = 'cygwin'\n") string(APPEND build "system = 'cygwin'\n")
elseif(CMAKE_HOST_UNIX) 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) string(TOLOWER "${VCPKG_CMAKE_SYSTEM_NAME}" meson_system_name)
endif() endif()
string(APPEND host "system = '${meson_system_name}'\n") 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_family = '${host_cpu_fam}'\n")
string(APPEND host "cpu = '${host_cpu}'") string(APPEND host "cpu = '${host_cpu}'")
if(NOT host_unkown) if(NOT host_unkown)

4
scripts/cmake/vcpkg_configure_meson.cmake
View File

@ -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") string(APPEND build "system = 'windows'\n")
elseif(CMAKE_HOST_APPLE) elseif(CMAKE_HOST_APPLE)
string(APPEND build "system = 'darwin'\n") string(APPEND build "system = 'darwin'\n")
string(APPEND build "subsystem = 'macos'\n")
elseif(VCPKG_HOST_IS_CYGWIN) elseif(VCPKG_HOST_IS_CYGWIN)
string(APPEND build "system = 'cygwin'\n") string(APPEND build "system = 'cygwin'\n")
elseif(CMAKE_HOST_UNIX) 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) string(TOLOWER "${VCPKG_CMAKE_SYSTEM_NAME}" meson_system_name)
endif() endif()
string(APPEND host "system = '${meson_system_name}'\n") 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_family = '${host_cpu_fam}'\n")
string(APPEND host "cpu = '${host_cpu}'") string(APPEND host "cpu = '${host_cpu}'")
if(NOT host_unkown) if(NOT host_unkown)

2
versions/baseline.json
View File

@ -10586,7 +10586,7 @@
}, },
"vcpkg-tool-meson": { "vcpkg-tool-meson": {
"baseline": "1.9.0", "baseline": "1.9.0",
"port-version": 8 "port-version": 9
}, },
"vcpkg-tool-mozbuild": { "vcpkg-tool-mozbuild": {
"baseline": "4.0.2", "baseline": "4.0.2",

5
versions/v-/vcpkg-tool-meson.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "f85c7f81ae0d98611514765992e5a5769d398bde",
"version": "1.9.0",
"port-version": 9
},
{ {
"git-tree": "6ac36671b3020549d60c900eff3140bc36403936", "git-tree": "6ac36671b3020549d60c900eff3140bc36403936",
"version": "1.9.0", "version": "1.9.0",