diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-07-10 21:12:29 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-07-12 18:56:14 +0200 |
commit | 41977d456b152d2b37c3941b3bf1b839d6096067 (patch) | |
tree | de16f2f38ce6f45aa128234e83c8f729c05b417a | |
parent | 70051c55fe80296dd135049fe4d2c49f51b38010 (diff) |
CMake: Simplify resource setup in WASM platform plugin
Use the BASE argument of qt_internal_add_resource to avoid the
specification of resource aliases.
Use QtBase_SOURCE_DIR in favor of QT_SOURCE_TREE to use a known
CMake-provided variable in favor of our own cooked up one.
Pick-to: 6.2
Task-number: QTBUG-88090
Change-Id: I0d8b30a1564495db475ae58596b52b373b2b173e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r-- | src/plugins/platforms/wasm/CMakeLists.txt | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/plugins/platforms/wasm/CMakeLists.txt b/src/plugins/platforms/wasm/CMakeLists.txt index 10e247b7dd..49acd05886 100644 --- a/src/plugins/platforms/wasm/CMakeLists.txt +++ b/src/plugins/platforms/wasm/CMakeLists.txt @@ -37,19 +37,17 @@ qt_internal_add_plugin(QWasmIntegrationPlugin ) # Resources: -set_source_files_properties("${QT_SOURCE_TREE}/src/3rdparty/wasm/Vera.ttf" PROPERTIES QT_RESOURCE_ALIAS "Vera.ttf") -set_source_files_properties("${QT_SOURCE_TREE}/src/3rdparty/wasm/DejaVuSans.ttf" PROPERTIES QT_RESOURCE_ALIAS "DejaVuSans.ttf") -set_source_files_properties("${QT_SOURCE_TREE}/src/3rdparty/wasm/DejaVuSansMono.ttf" PROPERTIES QT_RESOURCE_ALIAS "DejaVuSansMono.ttf") - set(wasmfonts_resource_files - "${QT_SOURCE_TREE}/src/3rdparty/wasm/Vera.ttf" - "${QT_SOURCE_TREE}/src/3rdparty/wasm/DejaVuSans.ttf" - "${QT_SOURCE_TREE}/src/3rdparty/wasm/DejaVuSansMono.ttf" + "${QtBase_SOURCE_DIR}/src/3rdparty/wasm/Vera.ttf" + "${QtBase_SOURCE_DIR}/src/3rdparty/wasm/DejaVuSans.ttf" + "${QtBase_SOURCE_DIR}/src/3rdparty/wasm/DejaVuSansMono.ttf" ) qt_internal_add_resource(QWasmIntegrationPlugin "wasmfonts" PREFIX "/fonts" + BASE + "${QtBase_SOURCE_DIR}/src/3rdparty/wasm" FILES ${wasmfonts_resource_files} ) |