From 06dd9145b56dfccd59b34a9271e0334f7f7397e2 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Tue, 1 Aug 2023 17:38:35 +0200 Subject: [PATCH] Allow building ProtobufWellKnownTypes on WASM packaging platform Specify QT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR that points to the host protobuf include directory, to grab the required .proto files. Task-number: QTBUG-115582 Change-Id: I3184439d92c8b79c9dc78a117584f7cf56b9eb97 Reviewed-by: Alexandru Croitor Reviewed-by: Konrad Kujawa (cherry picked from commit bde2b6e0eb100c6663f1d8823937f51d6c711d2a) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms_wasm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index 87ef3f63..39d8f60b 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -25,7 +25,7 @@ Configurations: 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', 'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples', 'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_pkg_config=OFF -DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFEATURE_native_grpc=OFF', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_pkg_config=OFF -DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_mingw}}/include', ] - Id: 'webassembly-macos-thread' @@ -38,6 +38,6 @@ Configurations: Environment variables: [ 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', 'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFEATURE_native_grpc=OFF', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', 'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON' ]