46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
diff --git a/src/core/configure/BUILD.root.gn.in b/src/core/configure/BUILD.root.gn.in
|
|
index 214ef6e715..8b76e08309 100644
|
|
--- a/src/core/configure/BUILD.root.gn.in
|
|
+++ b/src/core/configure/BUILD.root.gn.in
|
|
@@ -74,11 +74,22 @@ config("QtWebEngineCore_config") {
|
|
defines = [
|
|
@GN_DEFINES@,
|
|
]
|
|
+ # Don't let <vcpkg-installed>/include appear in QtWebEngineCore_config:
|
|
+ # vendored dependencies (protobuf, dawn, skia, ...) have inter-dependencies
|
|
+ # which must not accidentally pick headers from installed ports.
|
|
+ # Instead, attach these includes to a source_set used as another dependency.
|
|
+}
|
|
+config("QtWebEngineCore_include_dirs_config") {
|
|
include_dirs = [
|
|
@GN_INCLUDE_DIRS@,
|
|
rebase_path("${target_gen_dir}/.moc/")
|
|
]
|
|
}
|
|
+source_set("QtWebEngineCore_include_dirs") {
|
|
+ public_configs = [
|
|
+ ":QtWebEngineCore_include_dirs_config"
|
|
+ ]
|
|
+}
|
|
|
|
declare_args() {
|
|
use_embedded_config = false
|
|
@@ -214,6 +225,8 @@ shared_library("QtWebEngineCore") {
|
|
"//tools/v8_context_snapshot:v8_context_snapshot"
|
|
]
|
|
}
|
|
+ # Complements QtWebEngineCore_config modifcation
|
|
+ deps += [ ":QtWebEngineCore_include_dirs" ]
|
|
}
|
|
|
|
source_set("qtwebengine_spellcheck_sources") {
|
|
@@ -571,6 +584,8 @@ if (is_win) {
|
|
"@GN_SOURCE_ROOT@/sandbox_win.cpp"
|
|
]
|
|
public_deps = [ "//sandbox/win:sandbox" ]
|
|
+ # Complements QtWebEngineCore_config modifcation
|
|
+ deps = [ ":QtWebEngineCore_include_dirs" ]
|
|
}
|
|
}
|
|
|