diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-12-14 08:53:27 +0100 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2020-12-15 12:07:21 +0000 |
| commit | 1f391d58e84a798e876d1c7d243a3c17566350ef (patch) | |
| tree | 5ea56f8e6c6e73d16105ea46acb72026b60047a1 | |
| parent | 4ab9c25ba0238555ecb6b97b8fc3a3b7f912c2b0 (diff) | |
CMake: Fix .prl file generation
Work around QTBUG-89467 by re-ordering the add_subdirectory calls in
src/CMakeLists.txt.
The qmake project file looks correct. It's not entirely clear why
pro2cmake generated this particular call order. But by now it's not
worth fixing anymore. Also, the .prl file generation should not depend
on the order of add_subdirectory calls in the first place.
Fixes: QTBUG-89412
Pick-to: 6.0
Change-Id: I899608d8abe829e1b71ca9aa87734361947137f9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | src/CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a4a742fdc..dde6b2911 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,11 @@ # Generated from src.pro. add_subdirectory(core) +if(QT_FEATURE_qt3d_logic) + add_subdirectory(logic) +endif() +if(QT_FEATURE_qt3d_input) + add_subdirectory(input) +endif() if(QT_FEATURE_qt3d_render) add_subdirectory(render) @@ -7,12 +13,6 @@ if(QT_FEATURE_qt3d_render) add_subdirectory(extras) endif() endif() -if(QT_FEATURE_qt3d_logic) - add_subdirectory(logic) -endif() -if(QT_FEATURE_qt3d_input) - add_subdirectory(input) -endif() if(QT_FEATURE_qt3d_animation) add_subdirectory(animation) endif() |