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

meson: Mark OHOS as cross-compiled platform (#51894)

This commit is contained in:
Jörg Bornemann 2026-05-22 05:55:46 +02:00 committed by GitHub
parent a0df28c674
commit 75cabb002b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 9 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",
"version": "1.9.0",
"port-version": 7,
"port-version": 8,
"description": "Meson build system",
"homepage": "https://github.com/mesonbuild/meson",
"license": "Apache-2.0",

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

@ -283,6 +283,7 @@ function(z_vcpkg_get_build_and_host_system build_system host_system is_cross) #h
if(NOT build_cpu_fam MATCHES "${host_cpu_fam}"
OR VCPKG_TARGET_IS_ANDROID
OR VCPKG_TARGET_IS_OHOS
OR (VCPKG_TARGET_IS_APPLE AND NOT VCPKG_TARGET_IS_OSX)
OR VCPKG_TARGET_IS_UWP
OR (VCPKG_TARGET_IS_MINGW AND NOT CMAKE_HOST_WIN32))

1
scripts/cmake/vcpkg_configure_meson.cmake
View File

@ -264,6 +264,7 @@ function(z_vcpkg_get_build_and_host_system build_system host_system is_cross) #h
if(NOT build_cpu_fam MATCHES "${host_cpu_fam}"
OR VCPKG_TARGET_IS_ANDROID
OR VCPKG_TARGET_IS_OHOS
OR (VCPKG_TARGET_IS_APPLE AND NOT VCPKG_TARGET_IS_OSX)
OR VCPKG_TARGET_IS_UWP
OR (VCPKG_TARGET_IS_MINGW AND NOT CMAKE_HOST_WIN32))

2
versions/baseline.json
View File

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

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

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