2019-10-08 10:05:12 +00:00
|
|
|
# special case skip regeneration
|
CMake: Allow building bundled 3rd party libraries in qtbase
A few things are needed to accomplish that:
- the python scripts do not ignore certain system_foo features anymore
(it is a hardcoded list for now just to be safe)
- configurejson2cmake now outputs
qt_find_package(WrapSystemFoo) calls for bundled libraries
(see below)
- the harfbuzz .pro file is modified to accommodate pro2cmake
not being able to correctly parse some conditional scopes
- the freetype .pro file is modified to make sure linking of the
library succeeds without duplicate symbol errors, which qmake
doesn't encounter due to magical exclusion of cpp files that are
included in other cpp files (presumably for include moc_foo.cpp
support)
- feature evaluation for Core, Gui, Network now happens in the
qtbase/src directory, so that bundled libraries can be conditionally
built
- for each bundled library there are now two FindWrap scripts:
- FindWrapSystemFoo which finds an installed library in the system
- FindWrapFoo which either uses the system installed library or
the built bundled one depending on a condition
- projects that intend to use bundled libraries need to link against
WrapFoo::WrapFoo instead of WrapSystemFoo::WrapSystemFoo targets
(this is handled by pro2cmake).
Unfortunately manually added qt_find_package(WrapFoo) calls might
still be needed as is the case for WrapFreetype and others.
- a new cmake/QtFindWrapHelper.cmake file is added that provides
a macro to simplify creation of WrapFoo targets that link against
a bundled or system library. The implementation is fairly ugly
due to CMake macro constraints, but it was deemed better than
copy-pasting a bunch of almost identical code across all
FindWrapFoo.cmake files.
- a qtzlib header-only module is now created when using bundled
zlib, to provide public syncqt created headers for consumers
that need them. These are projects that have
'QT_PRIVATE += zlib-private' in their .pro files
(e.g. qtimageformats, qtlocation, qt3d, etc.)
This is unfortunately needed due to QtNetwork using zlib
types in its private C++ API.
The change includes support for building the following bundled
libraries:
- zlib
- libpng
- libjpeg
- Freetype
- Harfbuzz-ng
- PCRE2
The following 3rd party libraries are still using an old
implementation within the CMake build system, and should be migrated
to the new one in the near future:
- double-conversion
- Old harfbuzz
The are a few libraries that are not yet ported:
- system-sqlite
- systemxcb
- maybe others
Among other things, this change allows building qtbase on Windows
without requiring vcpkg.
Task-number: QTBUG-82167
Change-Id: I35ecea0d832f66c1943c82e618de4a51440971a5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
2020-02-14 13:53:28 +00:00
|
|
|
|
|
|
|
|
# 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
|
|
|
|
|
# should be built.
|
|
|
|
|
# The order of evaluation matters.
|
|
|
|
|
qt_feature_evaluate_features("${CMAKE_CURRENT_SOURCE_DIR}/corelib/configure.cmake")
|
2020-09-03 14:01:05 +00:00
|
|
|
if(QT_FEATURE_network)
|
|
|
|
|
qt_feature_evaluate_features("${CMAKE_CURRENT_SOURCE_DIR}/network/configure.cmake")
|
|
|
|
|
endif()
|
|
|
|
|
if(QT_FEATURE_gui)
|
|
|
|
|
qt_feature_evaluate_features("${CMAKE_CURRENT_SOURCE_DIR}/gui/configure.cmake")
|
|
|
|
|
endif()
|
CMake: Allow building bundled 3rd party libraries in qtbase
A few things are needed to accomplish that:
- the python scripts do not ignore certain system_foo features anymore
(it is a hardcoded list for now just to be safe)
- configurejson2cmake now outputs
qt_find_package(WrapSystemFoo) calls for bundled libraries
(see below)
- the harfbuzz .pro file is modified to accommodate pro2cmake
not being able to correctly parse some conditional scopes
- the freetype .pro file is modified to make sure linking of the
library succeeds without duplicate symbol errors, which qmake
doesn't encounter due to magical exclusion of cpp files that are
included in other cpp files (presumably for include moc_foo.cpp
support)
- feature evaluation for Core, Gui, Network now happens in the
qtbase/src directory, so that bundled libraries can be conditionally
built
- for each bundled library there are now two FindWrap scripts:
- FindWrapSystemFoo which finds an installed library in the system
- FindWrapFoo which either uses the system installed library or
the built bundled one depending on a condition
- projects that intend to use bundled libraries need to link against
WrapFoo::WrapFoo instead of WrapSystemFoo::WrapSystemFoo targets
(this is handled by pro2cmake).
Unfortunately manually added qt_find_package(WrapFoo) calls might
still be needed as is the case for WrapFreetype and others.
- a new cmake/QtFindWrapHelper.cmake file is added that provides
a macro to simplify creation of WrapFoo targets that link against
a bundled or system library. The implementation is fairly ugly
due to CMake macro constraints, but it was deemed better than
copy-pasting a bunch of almost identical code across all
FindWrapFoo.cmake files.
- a qtzlib header-only module is now created when using bundled
zlib, to provide public syncqt created headers for consumers
that need them. These are projects that have
'QT_PRIVATE += zlib-private' in their .pro files
(e.g. qtimageformats, qtlocation, qt3d, etc.)
This is unfortunately needed due to QtNetwork using zlib
types in its private C++ API.
The change includes support for building the following bundled
libraries:
- zlib
- libpng
- libjpeg
- Freetype
- Harfbuzz-ng
- PCRE2
The following 3rd party libraries are still using an old
implementation within the CMake build system, and should be migrated
to the new one in the near future:
- double-conversion
- Old harfbuzz
The are a few libraries that are not yet ported:
- system-sqlite
- systemxcb
- maybe others
Among other things, this change allows building qtbase on Windows
without requiring vcpkg.
Task-number: QTBUG-82167
Change-Id: I35ecea0d832f66c1943c82e618de4a51440971a5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
2020-02-14 13:53:28 +00:00
|
|
|
|
2018-10-24 13:20:27 +00:00
|
|
|
add_subdirectory(3rdparty)
|
|
|
|
|
|
|
|
|
|
function(find_or_build_bootstrap_names)
|
Export tool config and target files for each relevant module
CMake will now generate config and target files for each module that
provides tools. As a result, namespaced global targets such as
Qt5::moc or Qt5::rcc can be made available.
Third party projects that require just these tools, and not the Qt
modules themselves, should specify CMAKE_PREFIX_PATH pointing to the
installed Qt location, and call find_package(Qt5CoreTools),
find_package(Qt5GuiTools), etc.
It is also possible to call
find_package(Qt5Tools REQUIRED Core Widgets) where the last option
is a list of modules whose tools should be imported.
Note that all the tools are in the Qt5::
namespace and not in the Qt5CoreTools:: or Qt5WidgetsTools::
namespace.
This commit also changes the behavior regarding when to build tools
while building Qt itself.
When cross compiling Qt (checked via CMAKE_CROSSCOMPILING) or when
-DQT_FORCE_FIND_TOOLS=TRUE is passed, tools added by add_qt_tool will
always be searched for and not built.
In this case the user has to specify the CMake variable QT_HOST_PATH
pointing to an installed host Qt location.
When not cross compiling, tools added by add_qt_tool are built from
source.
When building leaf modules (like qtsvg) that require some tool that was
built in qtbase (like moc), the module project should contain a
find_package(Qt5ToolsCore) call and specify an appropriate
CMAKE_PREFIX_PATH so that the tool package is found.
Note that because HOST_QT_TOOLS_DIRECTORY was replaced by QT_HOST_PATH,
the ensure syncqt code was changed to make it work properly with
both qtbase and qtsvg.
Here's a list of tools and their module associations:
qmake, moc, rcc, tracegen, qfloat16-tables, qlalr -> CoreTools
qvkgen -> GuiTools
uic -> WidgetTools
dbus related tools -> DBusTools
Task-number: QTBUG-74134
Change-Id: Ie67d1e2f8de46102b48eca008f0b50caf4fbe3ed
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-04-10 17:21:22 +00:00
|
|
|
if (QT_WILL_BUILD_TOOLS)
|
2018-10-24 13:20:27 +00:00
|
|
|
add_subdirectory(tools/bootstrap) # bootstrap library
|
|
|
|
|
endif()
|
2019-02-11 14:50:17 +00:00
|
|
|
add_subdirectory(tools/moc)
|
|
|
|
|
add_subdirectory(tools/rcc)
|
|
|
|
|
add_subdirectory(tools/tracegen)
|
2019-11-26 09:10:55 +00:00
|
|
|
add_subdirectory(tools/cmake_automoc_parser)
|
2018-10-24 13:20:27 +00:00
|
|
|
endfunction()
|
|
|
|
|
|
|
|
|
|
find_or_build_bootstrap_names()
|
|
|
|
|
|
2020-11-12 11:58:06 +00:00
|
|
|
add_subdirectory(entrypoint)
|
|
|
|
|
|
2018-10-24 13:20:27 +00:00
|
|
|
add_subdirectory(corelib)
|
2018-10-30 13:25:57 +00:00
|
|
|
if (QT_FEATURE_concurrent)
|
|
|
|
|
add_subdirectory(concurrent)
|
|
|
|
|
endif()
|
2018-11-02 13:27:57 +00:00
|
|
|
if (QT_FEATURE_sql)
|
|
|
|
|
add_subdirectory(sql)
|
|
|
|
|
endif()
|
2018-10-30 13:25:57 +00:00
|
|
|
if (QT_FEATURE_network)
|
|
|
|
|
add_subdirectory(network)
|
2020-05-04 13:03:09 +00:00
|
|
|
if (ANDROID)
|
|
|
|
|
add_subdirectory(network/android/jar)
|
|
|
|
|
endif()
|
2018-10-30 13:25:57 +00:00
|
|
|
endif()
|
|
|
|
|
if (QT_FEATURE_xml)
|
|
|
|
|
add_subdirectory(xml)
|
|
|
|
|
endif()
|
Export tool config and target files for each relevant module
CMake will now generate config and target files for each module that
provides tools. As a result, namespaced global targets such as
Qt5::moc or Qt5::rcc can be made available.
Third party projects that require just these tools, and not the Qt
modules themselves, should specify CMAKE_PREFIX_PATH pointing to the
installed Qt location, and call find_package(Qt5CoreTools),
find_package(Qt5GuiTools), etc.
It is also possible to call
find_package(Qt5Tools REQUIRED Core Widgets) where the last option
is a list of modules whose tools should be imported.
Note that all the tools are in the Qt5::
namespace and not in the Qt5CoreTools:: or Qt5WidgetsTools::
namespace.
This commit also changes the behavior regarding when to build tools
while building Qt itself.
When cross compiling Qt (checked via CMAKE_CROSSCOMPILING) or when
-DQT_FORCE_FIND_TOOLS=TRUE is passed, tools added by add_qt_tool will
always be searched for and not built.
In this case the user has to specify the CMake variable QT_HOST_PATH
pointing to an installed host Qt location.
When not cross compiling, tools added by add_qt_tool are built from
source.
When building leaf modules (like qtsvg) that require some tool that was
built in qtbase (like moc), the module project should contain a
find_package(Qt5ToolsCore) call and specify an appropriate
CMAKE_PREFIX_PATH so that the tool package is found.
Note that because HOST_QT_TOOLS_DIRECTORY was replaced by QT_HOST_PATH,
the ensure syncqt code was changed to make it work properly with
both qtbase and qtsvg.
Here's a list of tools and their module associations:
qmake, moc, rcc, tracegen, qfloat16-tables, qlalr -> CoreTools
qvkgen -> GuiTools
uic -> WidgetTools
dbus related tools -> DBusTools
Task-number: QTBUG-74134
Change-Id: Ie67d1e2f8de46102b48eca008f0b50caf4fbe3ed
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-04-10 17:21:22 +00:00
|
|
|
add_subdirectory(tools)
|
|
|
|
|
|
2018-10-30 13:25:57 +00:00
|
|
|
if (QT_FEATURE_dbus)
|
|
|
|
|
add_subdirectory(dbus)
|
|
|
|
|
endif()
|
2018-10-24 13:20:27 +00:00
|
|
|
if(QT_FEATURE_gui)
|
|
|
|
|
add_subdirectory(gui)
|
|
|
|
|
|
2019-11-22 16:05:29 +00:00
|
|
|
if(QT_FEATURE_opengl)
|
2020-01-27 12:25:34 +00:00
|
|
|
add_subdirectory(opengl)
|
2019-11-22 16:05:29 +00:00
|
|
|
endif()
|
|
|
|
|
|
2018-10-24 13:20:27 +00:00
|
|
|
if(QT_FEATURE_widgets)
|
|
|
|
|
add_subdirectory(widgets)
|
2020-02-04 10:47:39 +00:00
|
|
|
if(QT_FEATURE_opengl)
|
|
|
|
|
add_subdirectory(openglwidgets)
|
|
|
|
|
endif()
|
2018-10-24 13:20:27 +00:00
|
|
|
endif()
|
|
|
|
|
add_subdirectory(platformsupport)
|
|
|
|
|
endif()
|
2018-10-30 13:25:57 +00:00
|
|
|
if (QT_FEATURE_testlib)
|
|
|
|
|
add_subdirectory(testlib)
|
|
|
|
|
endif()
|
2021-02-02 10:51:59 +00:00
|
|
|
if(QT_FEATURE_printsupport)
|
2019-02-14 10:23:50 +00:00
|
|
|
add_subdirectory(printsupport)
|
|
|
|
|
endif()
|
2018-10-24 13:20:27 +00:00
|
|
|
add_subdirectory(plugins)
|
2019-06-05 13:20:21 +00:00
|
|
|
|
2019-06-05 10:07:42 +00:00
|
|
|
add_subdirectory(android)
|
