diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-01-28 16:06:26 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-02-25 16:08:43 +0100 |
| commit | 43c28aa9046967abeb4ad042c8be1aa23a19c282 (patch) | |
| tree | b8f4a53cd9aaaa819c853ee51e66ea100c1ae3d5 /cmake/QtToolHelpers.cmake | |
| parent | 5a3bbb55851b84aa6a46c23e5a6fb33b4860edc6 (diff) | |
Use Core library for qmake instead of the Bootstrap library
Move the qmake-specific logic of the QLibraryInfo class to
qmake internals. 'qconfig.cpp.in' now stores information about
the library info entries to keep them consistent between qmake
and the Core library. qmake requires specific features enabled
in the Core library, so building qmake will be skipped if the
features are not enabled.
All flags directly related to the qmake have been removed from
Core lib.
Remove all bootstrap related sections from qmake CMakeLists.txt
Task-number: QTBUG-89369
Change-Id: I26de157d3bfd4a5526699296e9d46e1c180b89ae
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'cmake/QtToolHelpers.cmake')
| -rw-r--r-- | cmake/QtToolHelpers.cmake | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/cmake/QtToolHelpers.cmake b/cmake/QtToolHelpers.cmake index e6246ba94a..869a6e3300 100644 --- a/cmake/QtToolHelpers.cmake +++ b/cmake/QtToolHelpers.cmake @@ -22,7 +22,7 @@ function(qt_internal_add_tool target_name) qt_tool_target_to_name(name ${target_name}) set(one_value_keywords TOOLS_TARGET EXTRA_CMAKE_FILES INSTALL_DIR ${__default_target_info_args}) - qt_parse_all_arguments(arg "qt_add_tool" "BOOTSTRAP;NO_QT;NO_INSTALL" + qt_parse_all_arguments(arg "qt_add_tool" "BOOTSTRAP;NO_INSTALL" "${one_value_keywords}" "${__default_private_args}" ${ARGN}) @@ -109,19 +109,11 @@ function(qt_internal_add_tool target_name) endif() set(disable_autogen_tools "${arg_DISABLE_AUTOGEN_TOOLS}") - if (arg_NO_QT) - # FIXME: Remove NO_QT again once qmake can use a "normal" Qt! - if (arg_BOOTSTRAP) - message(FATAL_ERROR "Tool can not be NO_QT and BOOTSTRAP at the same time!") - endif() - set(corelib "") + if (arg_BOOTSTRAP) + set(corelib ${QT_CMAKE_EXPORT_NAMESPACE}::Bootstrap) + list(APPEND disable_autogen_tools "uic" "moc" "rcc") else() - if (arg_BOOTSTRAP) - set(corelib ${QT_CMAKE_EXPORT_NAMESPACE}::Bootstrap) - list(APPEND disable_autogen_tools "uic" "moc" "rcc") - else() - set(corelib ${QT_CMAKE_EXPORT_NAMESPACE}::Core) - endif() + set(corelib ${QT_CMAKE_EXPORT_NAMESPACE}::Core) endif() set(bootstrap "") @@ -129,11 +121,6 @@ function(qt_internal_add_tool target_name) set(bootstrap BOOTSTRAP) endif() - set(no_qt "") - if(arg_NO_QT) - set(no_qt NO_QT) - endif() - set(install_dir "${INSTALL_BINDIR}") if(arg_INSTALL_DIR) set(install_dir "${arg_INSTALL_DIR}") @@ -141,7 +128,6 @@ function(qt_internal_add_tool target_name) qt_internal_add_executable("${target_name}" OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${install_dir}" ${bootstrap} - ${no_qt} NO_INSTALL SOURCES ${arg_SOURCES} INCLUDE_DIRECTORIES @@ -178,7 +164,7 @@ function(qt_internal_add_tool target_name) if(TARGET host_tools) add_dependencies(host_tools "${target_name}") - if(bootstrap OR no_qt) + if(bootstrap) add_dependencies(bootstrap_tools "${target_name}") endif() endif() |