diff options
author | Michal Klocek <michal.klocek@qt.io> | 2021-08-20 10:33:57 +0200 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2021-08-30 19:47:56 +0200 |
commit | 68e724bf48eab90aca310d700b4aad0127b61d35 (patch) | |
tree | 7ac33f0adf9d38fd4b639ee75192cf8748f9ee8b /CMakeLists.txt | |
parent | add4dd7c1f50e09677f968a47c75309351e16743 (diff) |
Rewrite gn-cmake integration
The previous gn-cmake integration was driven towards having the
complete cmake build tree which included gn build artifacts.
These were marked as IMPORTED in cmake build files, this way
cmake "knew" all object files and static libs coming from gn.
To achieve that we needed to run the cmake configure twice.
First to feed gn with the build information from cmake and
then the second run to import all the build information to
cmake based on gn run.
As a side effect of this the first run cmake was creating incomplete
targets, so we could use generator expressions to gather all the data
needed for gn run. The second run of cmake was able to create fully
initialized targets. We used 'external project' to run cmake the second
time.
This approach worked well when doing "module" builds and having two
targets, one in the main project and one in external was not an issue.
Moreover, this approach could be integrated nicely since CI does only
"module" builds.
Unfortunately "top level" builds are implemented to import all qt
targets into one build tree. This created issue for qtwebengine since
fully initialized targets were 'hidden' by 'external project' and
including half baked (dummy) targets from the main project resulted
in bunch of issues related to the dependency tracking and build race
conditions. Also using 'external project' complicated installation
rules and in the end installation worked differently than in other
modules.
With current approach we use response files, so we hide all build
artifacts coming from gn and feed cmake with those response files.
This way we run the cmake configure once and we create all the targets
once. Using rsp files hacks linker options in cmake, so this approach
is sub-optimal, however allows to have working "top level" builds.
It is worth mentioning here that the final module linking has to take
place with cmake's part of build since doing one static lib in gn is
not possible due to the toolchain limitation (msvc is not able to
process static libs over 4Gb and has no support for thin archives,
so only a shared lib is doable at time of writing)
Following changes are made:
* remove 'external project' for qtwebengine target, we keep it however
for ninja ,gn and a host project
* call gn from cmake in a scripting mode during build and not configure
run, this way BUILD.gn is assembled as a build step so after
generator expressions are executed
* BUILD.gn is assembled now from 4 files:
- root template BUILD.root.gn.in
- compiler data gn_config_c.cmake, gn_config_cxx.cmake
- sources data gn_cofnig_target.cmake
* since we use gn wrapper script use gn.args file to pass arguments
instead of a command line, so this file can be now easily modified
when running gn and ninja 'manually'
* since a script mode does not support handling of properties with
TARGET as such, use the DIRECTORY scope in some of our functions
which handle GN_TARGET
* use qt_build_repo() in main CMakeFile and remove all coin and top
level build hacks
* remove 'external project' for examples and tests, this is no longer
required as all qt targets are not hidden by external project
* remove leftovers from gn feedback call used for GN_TARGET
* improve installation rules, WebEgineCore target is not by default
installed during build, therefore we need to copy resources and
translations to root so tests and examples still can be built without
a module being installed first
* adjust GN lookup paths, we look for gn in main configure and during
scripting mode when gn is executed
Fixes: QTBUG-94349
Fixes: QTBUG-94709
Fixes: QTBUG-94922
Fixes: QTBUG-94997
Fixes: QTBUG-95051
Fixes: QTBUG-95152
Fixes: QTBUG-95158
Fixes: QTBUG-95972
Task-number: QTBUG-95231
Task-number: QTBUG-95590
Change-Id: I5e7a34287ee59d904103fe310fc7c6a36a8dfbc9
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit bd75c51f2a7f7384d3303e86764211cb3e32f03d)
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 274 |
1 files changed, 6 insertions, 268 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 823945088..f80888064 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,9 +4,9 @@ include(.cmake.conf) include(ExternalProject) include(cmake/Functions.cmake) -project(QtWebEngineRepoSuperBuild +project(QtWebEngineAndQtPdf VERSION "${QT_REPO_MODULE_VERSION}" - DESCRIPTION "Qt WebEngine Libraries" + DESCRIPTION "QtWebEngine and QtPdf modules" HOMEPAGE_URL "https://qt.io/" LANGUAGES CXX C ) @@ -17,272 +17,10 @@ set(QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS TRUE) # Make sure we use the fixed BASE argument of qt_add_resource. set(QT_USE_FIXED_QT_ADD_RESOURCE_BASE TRUE) -option(FORCE_TEST_RUN "Forces test run after compilation" FALSE) - find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) - -# coin configures 'just' for test build -if(QT_BUILD_STANDALONE_TESTS) - qt_build_repo() - return() -endif() - -set(installDir ${CMAKE_CURRENT_BINARY_DIR}/install) - -### FEATURES - -qt_build_repo_begin() -qt_feature_module_begin(ONLY_EVALUATE_FEATURES) -# Enable printing of feature summary by forcing qt_configure_record_command -# to work in spite of ONLY_EVALUATE_FEATURES. -set(__QtFeature_only_evaluate_features OFF) -include(configure.cmake) -include(src/core/api/configure.cmake) -include(src/webenginequick/configure.cmake) -include(src/pdf/configure.cmake) -qt_feature_module_end(ONLY_EVALUATE_FEATURES) -if(NOT ${QtWebEngine_SUPPORT}) - add_custom_target(WebEngineErrorMessage ALL - ${CMAKE_COMMAND} -E cmake_echo_color --red "QtWebEngine will not be built: ${QtWebEngine_ERROR}" - COMMENT "Check QtWebEngine support" - VERBATIM - ) - message("-- Support check for QtWebEngine failed: ${QtWebEngine_ERROR}") - set(QT_FEATURE_qtwebengine_build OFF CACHE BOOL "Build QtWebEngine" FORCE) -endif() - -if(NOT ${QtPdf_SUPPORT}) - add_custom_target(PdfErrorMessage ALL - ${CMAKE_COMMAND} -E cmake_echo_color --red "QtPdf will not be built: ${QtPdf_ERROR}" - COMMENT "Check QtPdf support" - VERBATIM - ) - message("-- Support check for QtPdf failed: ${QtPdf_ERROR}") - set(QT_FEATURE_qtpdf_build OFF CACHE BOOL "Build QtPdf" FORCE) -endif() - -if(NOT QT_FEATURE_qtwebengine_build AND NOT QT_FEATURE_qtpdf_build) - # coin missing artifacts workaround - install(FILES coin-bug-707 DESTINATION ${INSTALL_DATADIR}) - return() -endif() - -if(QT_FEATURE_qtwebengine_build) - add_subdirectory(src/core/api) - add_subdirectory(src/core/tools) - add_subdirectory(src/process) - add_subdirectory(src/webenginewidgets) - add_subdirectory(src/webenginequick) -endif() - -if(QT_FEATURE_qtpdf_build) - add_subdirectory(src/pdf) - add_subdirectory(src/pdfwidgets) - add_subdirectory(src/pdfquick) -endif() -qt_build_repo_end() -get_install_config(installConfig) - -### NINJA - -if(NOT Ninja_FOUND) - externalproject_add(ninja - SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/src/ninja - BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/ninja - INSTALL_DIR ${installDir} - PREFIX ninja - USES_TERMINAL_BUILD ON - CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release - -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> - -DCMAKE_PREFIX_PATH:PATH=<INSTALL_DIR> - ) -endif() - -### GN - -if(NOT Gn_FOUND) - externalproject_add(gn - SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/src/gn - BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/gn - INSTALL_DIR ${installDir} - PREFIX gn - USES_TERMINAL_BUILD ON - CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} - -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} - -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> - -DCMAKE_PREFIX_PATH:PATH=<INSTALL_DIR> - -DWEBENGINE_ROOT_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR} - ) -endif() - - -### LIBS - -# on windows source path can be specified without hard drive letter, -# however we need that for gn use REALPATH -get_filename_component(WEBENGINE_ROOT_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" REALPATH) -get_qt_features(featureList webengine) -get_qt_features(featureList qtwebengine) -get_qt_features(featureList qtpdf) - -if(NOT DEFINED CMAKE_TOOLCHAIN_FILE AND QT_SUPERBUILD) - set(CMAKE_TOOLCHAIN_FILE "${CMAKE_BINARY_DIR}/qtbase/lib/cmake/Qt6/qt.toolchain.cmake") - list(APPEND libsCmakeArgs - "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}" - ) -endif() - -if(NOT DEFINED CMAKE_TOOLCHAIN_FILE) - message(FATAL_ERROR "QtWebEngine build requires CMAKE_TOOLCHAIN_FILE. Please provide one or use qt-cmake.") -endif() - -list(TRANSFORM featureList PREPEND "-D") -list(APPEND libsCmakeArgs - "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}" - "-DWEBENGINE_ROOT_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}" - "-DWEBENGINE_ROOT_SOURCE_DIR=${WEBENGINE_ROOT_SOURCE_DIR}" - "-DWEBENGINE_REPO_BUILD=TRUE" - "${featureList}" -) - -if (CMAKE_C_COMPILER_LAUNCHER) - list(APPEND libsCmakeArgs "-DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}") -endif() -if (CMAKE_CXX_COMPILER_LAUNCHER) - list(APPEND libsCmakeArgs "-DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}") -endif() - -if(QT_HOST_PATH) - list(APPEND libsCmakeArgs "-DQT_HOST_PATH=${QT_HOST_PATH}") -endif() - -if(LINUX) - set(cmd "${CMAKE_COMMAND} --build ${CMAKE_CURRENT_BINARY_DIR}/src") - file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/build.sh CONTENT "ulimit -n 4096 && ${cmd}\n") - set(coinBug699 COMMAND bash build.sh) -else() - if ("${CMAKE_DEFAULT_CONFIGS}" STREQUAL "all") - set(coinBug699 COMMAND ${CMAKE_COMMAND} --build ${CMAKE_CURRENT_BINARY_DIR}/src) - else() - set(coinBug699 COMMAND ${CMAKE_COMMAND} --build ${CMAKE_CURRENT_BINARY_DIR}/src --config $<CONFIG>) - endif() -endif() - -# use qtwebengine as name since it is should visible for topLevel builds -externalproject_add(qtwebengine - SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/src - BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/src - PREFIX libs - USES_TERMINAL_CONFIGURE ON - USES_TERMINAL_BUILD ON - BUILD_ALWAYS TRUE - CMAKE_ARGS ${libsCmakeArgs} - BUILD_COMMAND ${CMAKE_COMMAND} -E echo "Starting $<CONFIG> build" - ${coinBug699} - COMMAND ${CMAKE_COMMAND} -E echo "$<CONFIG> build complete" - # TODO: this is aworkaround for broken qt_lib_webengine*.pri files, - # coin does the in-source build and later calls qmake to build examples - # and this leftover file gets sucked instead of install or src/mkspecs, - # simply remove it, we need to implment a dry run in qt base to fix it. - COMMAND ${CMAKE_COMMAND} -E remove_directory ../mkspecs -) - -# required for topLevel build -qt_get_tool_target_name(cacheGenTarget qmlcachegen) -add_implicit_dependencies(qtwebengine Core Gui Widgets Network OpenGL - OpenGLWidgets Quick QuickWidgets Qml PrintSupport WebChannel Positioning ${cacheGenTarget} +find_package(Qt6 ${PROJECT_VERSION} CONFIG QUIET OPTIONAL_COMPONENTS + Gui Widgets Network OpenGL OpenGLWidgets Quick Qml PrintSupport + WebChannel Positioning QuickControls2 Test QuickWidgets QuickTest WebSockets ) -# Ensure the libs project is reconfigured if the root project is reconfigured, so that the -# correct CMake and qmake support files are used when building examples, rather than -# using the incomplete support files created by the root project. -qt_internal_add_external_project_dependency_to_root_project(qtwebengine) - -if(QT_BUILD_EXAMPLES AND BUILD_SHARED_LIBS) - externalproject_add(qtwebengine_examples - SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/examples - BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/examples - PREFIX examples - USES_TERMINAL_BUILD ON - BUILD_ALWAYS TRUE - CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} - "${featureList}" - ) - externalproject_add_stepdependencies(qtwebengine_examples install qtwebengine) -endif() - -if(FORCE_TEST_RUN OR QT_BUILD_TESTS) - find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS QuickTest Test) - find_package(Qt6 ${PROJECT_VERSION} CONFIG QUIET OPTIONAL_COMPONENTS WebSockets) - unset(testRunCommand) - if(FORCE_TEST_RUN) - set(testRunCommand TEST_COMMAND ctest) - endif() - externalproject_add(qtwebengine_tests - SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/tests - BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/tests - PREFIX tests - USES_TERMINAL_BUILD ON - USES_TERMINAL_TEST ON - BUILD_ALWAYS TRUE - CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} - "${featureList}" - INSTALL_COMMAND "" - ${testRunCommand} - ) - externalproject_add_stepdependencies(qtwebengine_tests install qtwebengine) - add_implicit_dependencies(qtwebengine_tests Test QuickTest WebSockets) - if(QT_BUILD_EXAMPLES AND BUILD_SHARED_LIBS) - externalproject_add_stepdependencies(qtwebengine_tests install qtwebengine_examples) - endif() -endif() - -if(NOT Gn_FOUND) - externalproject_add_stepdependencies(qtwebengine install gn) -endif() - -if(NOT Ninja_FOUND) - externalproject_add_stepdependencies(gn install ninja) -endif() - -if(QT_FEATURE_qtwebengine_build AND NOT QT_FEATURE_framework) - # install resources (again), coin calls install with DESTDIR - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/translations/qtwebengine_locales - DESTINATION ${CMAKE_INSTALL_PREFIX}/translations - ) - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/resources - DESTINATION ${CMAKE_INSTALL_PREFIX} - ) -endif() - -### CROSS BUILD SETUP - -# install gn for cross build -# TODO: is this really needed, should we skip it and just build gn as host build ? -if(LINUX AND NOT Gn_FOUND OR INSTALL_GN) - set(INSTALL_GN 1 CACHE INTERNAL "") - install( - PROGRAMS ${installDir}/bin/gn - CONFIGURATIONS ${installConfig} - RUNTIME DESTINATION "${INSTALL_LIBEXECDIR}" - ) -endif() - -if(CMAKE_CROSSCOMPILING) - externalproject_add(hostBuild - SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/src/host - BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/host - PREFIX host - USES_TERMINAL_BUILD ON - CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${QT_HOST_PATH}/lib/cmake/Qt6/qt.toolchain.cmake - -DWEBENGINE_ROOT_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR} - -DWEBENGINE_ROOT_SOURCE_DIR=${WEBENGINE_ROOT_SOURCE_DIR} - -DGN_TARGET_CPU=${TEST_architecture_arch} - -DCMAKE_C_FLAGS= - -DCMAKE_CXX_FLAGS= - -DQT_FEATURE_qtwebengine_build=${QT_FEATURE_qtwebengine_build} - -DQT_FEATURE_qtpdf_build=${QT_FEATURE_qtpdf_build} - ) - externalproject_add_stepdependencies(qtwebengine install hostBuild) -endif() +qt_build_repo() |