diff options
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r-- | src/CMakeLists.txt | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 62daf295e7..afcdd1f463 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,5 @@ -# special case skip regeneration +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause # We need to include the features of a few modules before they are actually declared. # The feature values are used as conditions for deciding whether bundled 3rd party libraries @@ -12,7 +13,7 @@ if(QT_FEATURE_gui) qt_feature_evaluate_features("${CMAKE_CURRENT_SOURCE_DIR}/gui/configure.cmake") endif() -add_subdirectory(3rdparty) +add_subdirectory(tools/syncqt) function(find_or_build_bootstrap_names) if (QT_WILL_BUILD_TOOLS) @@ -20,6 +21,7 @@ function(find_or_build_bootstrap_names) endif() add_subdirectory(tools/moc) add_subdirectory(tools/rcc) + add_subdirectory(tools/tracepointgen) add_subdirectory(tools/tracegen) add_subdirectory(tools/cmake_automoc_parser) endfunction() @@ -28,7 +30,23 @@ find_or_build_bootstrap_names() add_subdirectory(entrypoint) +# These 3rd party libraries need to be built before corelib, because corelib +# does qt_find_package for them. +if(QT_FEATURE_regularexpression AND NOT QT_FEATURE_system_pcre2) + add_subdirectory(3rdparty/pcre2) +endif() +qt_install_3rdparty_library_wrap_config_extra_file(BundledPcre2) + +if(NOT QT_FEATURE_system_zlib) + add_subdirectory(3rdparty/zlib) +endif() +qt_install_3rdparty_library_wrap_config_extra_file(BundledZLIB) + add_subdirectory(corelib) + +# Needs to be after corelib, because some of them reference Core. +add_subdirectory(3rdparty) + if (QT_FEATURE_concurrent) add_subdirectory(concurrent) endif() @@ -44,13 +62,16 @@ endif() if (QT_FEATURE_xml) add_subdirectory(xml) endif() -add_subdirectory(tools) if (QT_FEATURE_dbus) add_subdirectory(dbus) endif() + +add_subdirectory(tools) + if(QT_FEATURE_gui) add_subdirectory(gui) + add_subdirectory(assets) if(QT_FEATURE_opengl) add_subdirectory(opengl) |