diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-05 13:35:02 +0200 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-07-24 12:02:30 +0000 |
| commit | 78254be6cbd239a3de332c5660b2c408d9f3e674 (patch) | |
| tree | feca8f2213db8da240158000b03a3d61b1f77469 /src/CMakeLists.txt | |
| parent | 55cc9396e0832d84ce231c0f608c2b6850d7ef78 (diff) | |
Build projects from src/import
Add support to build the projects under src/imports.
All the CMakeLists.txt were generate with pro2cmake, except for
src/imports/builtins.
Change-Id: I06046ede82ba5b1e677e92b7548f543d020b0354
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b1795ebafc..df2a0b0ae1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,8 +2,6 @@ add_subdirectory(qml) add_subdirectory(qmlmodels) -add_subdirectory(plugins) -#add_subdirectory(imports) if(QT_FEATURE_qml_worker_script) add_subdirectory(qmlworkerscript) @@ -13,6 +11,7 @@ if(TARGET Qt::Gui AND QT_FEATURE_qml_animation) add_subdirectory(quick) add_subdirectory(quickshapes) + find_package(Qt6 ${PROJECT_VERSION} CONFIG COMPONENTS Test) # special case if(QT_FEATURE_testlib AND TARGET Qt::Test) # special case add_subdirectory(qmltest) endif() @@ -26,6 +25,12 @@ if(TARGET Qt::Gui AND QT_FEATURE_qml_animation) endif() endif() +# special case begin +# These need to be included here since they have dependencies on the modules +# specified above. +add_subdirectory(plugins) +add_subdirectory(imports) + if(QT_FEATURE_qml_devtools) add_subdirectory(qmldevtools) endif() @@ -36,3 +41,4 @@ if(QT_FEATURE_qml_network) add_subdirectory(qmldebug) endif() endif() +# special case end |