diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2021-07-15 10:36:02 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-19 23:24:32 +0000 |
| commit | ef4cc58ae7ac5a8e296c55defd9bd676c7d0a0d6 (patch) | |
| tree | dcf9941646af030824e6beb09bf192e25f95878a /CMakeLists.txt | |
| parent | 465ee007b8bf1b115171b182c98eeb57c141601b (diff) | |
Fix missing toolchain error
Since d53f7fcc52 we require toolchain in certain cases.
Add super build check.
Add user notice that qttoolchain.cmake file is required.
Moreover WebEngine uses external project and cmake does
not support querying user defines from command line and
this issue is tracked here:
https://gitlab.kitware.com/cmake/cmake/-/issues/19622
Therefore we assume we get all the data from toolchain.
Fixes: QTBUG-94757
Task-number: QTBUG-94804
Task-number: QTBUG-95051
Task-number: QTBUG-94997
Change-Id: Ibee121ac390892c28d2e6a388e73700a7e69a521
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit cc554531a06e45b76d08eff31ffbc2cd3c136f7d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index aecea8aed..5c33b95da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,13 +113,17 @@ get_filename_component(WEBENGINE_ROOT_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" R get_qt_features(featureList webengine) get_qt_features(featureList qtwebengine) -if(NOT DEFINED CMAKE_TOOLCHAIN_FILE) +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}" |