diff options
| author | Christian Strømme <christian.stromme@qt.io> | 2023-01-25 14:22:32 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-01-26 18:22:04 +0000 |
| commit | d0b0c0a2b901c5d022a9848633e860c6ff7f8d0b (patch) | |
| tree | f729cc6f85aa9f042036ef1a9f367b8c00e8f044 | |
| parent | 90bf779da459f811e70187ee7248b07fddf254e9 (diff) | |
Simplify and fix the conditional for building the asset importer plugin
This amends dde486a142a30 as that change, while enabling builds on
Android, caused other platforms (iOS, WoA etc.) to not build the assimp
import plugin. The conditional is no simplified to just the few
platforms we don't want to build for (intergrity and wasm)
Fixes: QTBUG-110593
Change-Id: Iae8694836d152598f502ddb4c5e6e25b705ccdac
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
(cherry picked from commit fec99c2f1c023ae77d643a976c7d2fdcd2d12138)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/plugins/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index a076d74c..b1b8320a 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -1,5 +1,5 @@ # Generated from plugins.pro. -if((NOT INTEGRITY AND NOT CMAKE_CROSSCOMPILING AND NOT WASM) AND (NOT CMAKE_CROSSCOMPILING OR NOT INTEGRITY) AND (NOT INTEGRITY OR NOT WASM)) +if (NOT INTEGRITY AND NOT WASM AND NOT QNX AND NOT rtems) add_subdirectory(assetimporters) endif() |