From 75cabb002b38ee946bb9e05245c4f984d93a6f3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Bornemann?= <joerg.bornemann@qt.io>
Date: Fri, 22 May 2026 05:55:46 +0200
Subject: [PATCH] meson: Mark OHOS as cross-compiled platform (#51894)

---
 ports/vcpkg-tool-meson/vcpkg.json                  | 2 +-
 ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake | 1 +
 scripts/cmake/vcpkg_configure_meson.cmake          | 1 +
 versions/baseline.json                             | 2 +-
 versions/v-/vcpkg-tool-meson.json                  | 5 +++++
 5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ports/vcpkg-tool-meson/vcpkg.json b/ports/vcpkg-tool-meson/vcpkg.json
index 219175aa72..8b52e93147 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": 7,
+  "port-version": 8,
   "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 48fd9ba156..117adee747 100644
--- a/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake
+++ b/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake
@@ -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))
diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake
index 6ed9c9e465..c716f6cd49 100644
--- a/scripts/cmake/vcpkg_configure_meson.cmake
+++ b/scripts/cmake/vcpkg_configure_meson.cmake
@@ -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))
diff --git a/versions/baseline.json b/versions/baseline.json
index da15d0e0b1..60a0c3965b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -10558,7 +10558,7 @@
     },
     "vcpkg-tool-meson": {
       "baseline": "1.9.0",
-      "port-version": 7
+      "port-version": 8
     },
     "vcpkg-tool-mozbuild": {
       "baseline": "4.0.2",
diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json
index fbc07688ba..3d475c7005 100644
--- a/versions/v-/vcpkg-tool-meson.json
+++ b/versions/v-/vcpkg-tool-meson.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6ac36671b3020549d60c900eff3140bc36403936",
+      "version": "1.9.0",
+      "port-version": 8
+    },
     {
       "git-tree": "cf7f8a95eef222e762d63ce7ae0aaa78d834f291",
       "version": "1.9.0",