diff options
| -rw-r--r-- | tools/.prev_CMakeLists.txt | 76 | ||||
| -rw-r--r-- | tools/CMakeLists.txt | 75 | ||||
| -rw-r--r-- | tools/tools.pro | 4 |
3 files changed, 68 insertions, 87 deletions
diff --git a/tools/.prev_CMakeLists.txt b/tools/.prev_CMakeLists.txt index 0233f2e8d0..324da4ee59 100644 --- a/tools/.prev_CMakeLists.txt +++ b/tools/.prev_CMakeLists.txt @@ -1,54 +1,42 @@ # Generated from tools.pro. +qt_exclude_tool_directories_from_default_target( + qmlprofiler + qmlplugindump + qmleasing +) + if(QT_FEATURE_qml_devtools) add_subdirectory(qmllint) - add_subdirectory(qmlmin) add_subdirectory(qmlimportscanner) - - if(QT_FEATURE_commandlineparser AND QT_FEATURE_xmlstreamwriter) - add_subdirectory(qmlcachegen) - endif() + add_subdirectory(qmlformat) endif() - -if(QT_FEATURE_thread AND NOT ANDROID OR android_app AND NOT WASM AND NOT rtems) +if(QT_FEATURE_qml_devtools AND QT_FEATURE_xmlstreamwriter) + add_subdirectory(qmlcachegen) +endif() +if(QT_FEATURE_thread AND NOT ANDROID AND NOT WASM AND NOT rtems) add_subdirectory(qml) - - if(QT_FEATURE_qml_profiler) - add_subdirectory(qmlprofiler) - endif() - - if(QT_FEATURE_qml_preview) - add_subdirectory(qmlpreview) - endif() - - if(TARGET Qt::Quick) - - if(NOT static) - add_subdirectory(qmlscene) - add_subdirectory(qmltime) - - if(QT_FEATURE_regularexpression AND QT_FEATURE_process) - add_subdirectory(qmlplugindump) - endif() - endif() - - if(TARGET Qt::Widgets) - - if(QT_FEATURE_dialogbuttonbox) - add_subdirectory(qmleasing) - endif() - endif() - endif() - - if(TARGET Qt::QuickTest) - add_subdirectory(qmltestrunner) - endif() - - if(QT_FEATURE_private_tests) - add_subdirectory(qmljs) - endif() endif() - -if(QT_FEATURE_qml_devtools) +if(QT_FEATURE_qml_profiler AND QT_FEATURE_thread AND NOT ANDROID AND NOT WASM AND NOT rtems) + add_subdirectory(qmlprofiler) +endif() +if(QT_FEATURE_qml_preview AND QT_FEATURE_thread AND NOT ANDROID AND NOT WASM AND NOT rtems) + add_subdirectory(qmlpreview) +endif() +if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_thread AND TARGET Qt::Quick AND NOT ANDROID AND NOT WASM AND NOT rtems) + add_subdirectory(qmlscene) + add_subdirectory(qmltime) +endif() +if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_process AND QT_FEATURE_regularexpression AND QT_FEATURE_thread AND TARGET Qt::Quick AND NOT ANDROID AND NOT WASM AND NOT rtems) + add_subdirectory(qmlplugindump) +endif() +if(QT_FEATURE_dialogbuttonbox AND QT_FEATURE_thread AND TARGET Qt::Quick AND TARGET Qt::Widgets AND NOT ANDROID AND NOT WASM AND NOT rtems) + add_subdirectory(qmleasing) +endif() +if(QT_FEATURE_thread AND TARGET Qt::QuickTest AND NOT ANDROID AND NOT WASM AND NOT rtems) + add_subdirectory(qmltestrunner) +endif() +if(QT_FEATURE_private_tests AND QT_FEATURE_thread AND NOT ANDROID AND NOT WASM AND NOT rtems) + add_subdirectory(qmljs) endif() diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index b1c05782b3..8438e8c6fa 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -1,53 +1,46 @@ # Generated from tools.pro. +qt_exclude_tool_directories_from_default_target( + qmlprofiler + qmlplugindump + qmleasing +) + if(QT_FEATURE_qml_devtools) add_subdirectory(qmllint) add_subdirectory(qmlimportscanner) add_subdirectory(qmlformat) - # special case: Do not build qmlcachegen here but build it at src/ +endif() +if(QT_FEATURE_qml_devtools AND QT_FEATURE_xmlstreamwriter) + # special case begin + # Do not build qmlcachegen here but build it at src/ # time, so that we can use it for our own .qml files in src/imports. + # add_subdirectory(qmlcachegen) + # special case end endif() - -if(QT_FEATURE_thread AND NOT ANDROID OR android_app AND NOT WASM AND NOT rtems) +if(QT_FEATURE_thread AND NOT ANDROID AND NOT WASM AND NOT rtems) add_subdirectory(qml) - - if(QT_FEATURE_qml_profiler) - add_subdirectory(qmlprofiler) - endif() - - if(QT_FEATURE_qml_preview) - add_subdirectory(qmlpreview) - endif() - - if(TARGET Qt::Quick) - - if(BUILD_SHARED_LIBS) # special case - add_subdirectory(qmlscene) - add_subdirectory(qmltime) - - if(QT_FEATURE_regularexpression AND QT_FEATURE_process) - add_subdirectory(qmlplugindump) - endif() - endif() - - if(TARGET Qt::Widgets) - - if(QT_FEATURE_dialogbuttonbox) - add_subdirectory(qmleasing) - endif() - endif() - endif() - - if(TARGET Qt::QuickTest) - add_subdirectory(qmltestrunner) - endif() - - if(QT_FEATURE_private_tests) - add_subdirectory(qmljs) - endif() endif() - -if(QT_FEATURE_qml_devtools) +if(QT_FEATURE_qml_profiler AND QT_FEATURE_thread AND NOT ANDROID AND NOT WASM AND NOT rtems) + add_subdirectory(qmlprofiler) +endif() +if(QT_FEATURE_qml_preview AND QT_FEATURE_thread AND NOT ANDROID AND NOT WASM AND NOT rtems) + add_subdirectory(qmlpreview) +endif() +if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_thread AND TARGET Qt::Quick AND NOT ANDROID AND NOT WASM AND NOT rtems) + add_subdirectory(qmlscene) + add_subdirectory(qmltime) +endif() +if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_process AND QT_FEATURE_regularexpression AND QT_FEATURE_thread AND TARGET Qt::Quick AND NOT ANDROID AND NOT WASM AND NOT rtems) + add_subdirectory(qmlplugindump) +endif() +if(QT_FEATURE_dialogbuttonbox AND QT_FEATURE_thread AND TARGET Qt::Quick AND TARGET Qt::Widgets AND NOT ANDROID AND NOT WASM AND NOT rtems) + add_subdirectory(qmleasing) +endif() +if(QT_FEATURE_thread AND TARGET Qt::QuickTest AND NOT ANDROID AND NOT WASM AND NOT rtems) + add_subdirectory(qmltestrunner) +endif() +if(QT_FEATURE_private_tests AND QT_FEATURE_thread AND NOT ANDROID AND NOT WASM AND NOT rtems) + add_subdirectory(qmljs) endif() - diff --git a/tools/tools.pro b/tools/tools.pro index 07eaa0be70..21b23f20fa 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -10,14 +10,14 @@ qtConfig(qml-devtools) { qtConfig(xmlstreamwriter): SUBDIRS += qmlcachegen } -qtConfig(thread):!android|android_app:!wasm:!rtems { +qtConfig(thread):!android:!wasm:!rtems { SUBDIRS += qml qtConfig(qml-profiler): SUBDIRS += qmlprofiler qtConfig(qml-preview): SUBDIRS += qmlpreview qtHaveModule(quick) { - !static: { + !contains(CONFIG, static) { SUBDIRS += \ qmlscene \ qmltime |