Allow building the tests directory as a standalone CMake project
At the moment, Coin builds tests as a separate qmake invocation
against an installed Qt. We need to support the same with CMake.
Change the tests subdirectory to be a standalone CMake project when
CMake does not detect an existing QtTest target while processing the
subdirectory. If the target exists, it means we are building the whole
repo, if the target does not exist, we need to call find_package
to find the installed Qt.
Refactor and move around a few things to make standalone tests build
successfully:
- add a new macro to set up paths to find QtSetup
- add a new macro to find all macOS frameworks
- add a new macro to set up building tests
- add a new macro that actually builds the tests
- export the INSTALL_CMAKE_NAMESPACE value into the BuildInternals
Config file
- export the CMAKE_BUILD_TYPE value, because a test project doesn't
have a .git subdir and thus defaults to be built in Release
mode, even though qtbase might have been built in Debug, so to
avoid the mixing, the propagate the build type
- stop overriding INSTALL_CMAKE_NAMESPACE and
QT_CMAKE_EXPORT_NAMESPACE inside QtSetup if they are set, because
the tests project doesn't specify a major version, and if we
override the values, the moc / uic targets don't get the correct
major version prefix and configuration fails
Change-Id: Ibdb03687302567fe325a15f6d1cb922c76240675
Fixes: QTBUG-75090
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-05-22 08:22:08 +00:00
|
|
|
qt_find_apple_system_frameworks()
|
2019-01-29 12:04:36 +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/qfloat16-tables)
|
|
|
|
|
add_subdirectory(tools/tracegen)
|
2018-10-24 13:20:27 +00:00
|
|
|
endfunction()
|
|
|
|
|
|
|
|
|
|
find_or_build_bootstrap_names()
|
|
|
|
|
|
|
|
|
|
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)
|
|
|
|
|
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)
|
|
|
|
|
|
|
|
|
|
# Need to build qmake and other Core tools before exporting them.
|
|
|
|
|
qt_export_tools(Core)
|
|
|
|
|
|
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)
|
|
|
|
|
|
|
|
|
|
if(QT_FEATURE_widgets)
|
|
|
|
|
add_subdirectory(widgets)
|
|
|
|
|
if(QT_FEATURE_opengl)
|
|
|
|
|
add_subdirectory(opengl)
|
|
|
|
|
endif()
|
|
|
|
|
endif()
|
|
|
|
|
add_subdirectory(platformsupport)
|
|
|
|
|
add_subdirectory(platformheaders)
|
|
|
|
|
endif()
|
2018-10-30 13:25:57 +00:00
|
|
|
if (QT_FEATURE_testlib)
|
|
|
|
|
add_subdirectory(testlib)
|
|
|
|
|
endif()
|
2019-02-13 12:12:14 +00:00
|
|
|
if(QT_FEATURE_gui AND QT_FEATURE_widgets)
|
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
|
|
|
|
|
|
|
|
add_subdirectory(winmain)
|
