From cc554531a06e45b76d08eff31ffbc2cd3c136f7d Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Thu, 15 Jul 2021 10:36:02 +0200 Subject: 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 Pick-to: 6.2 Change-Id: Ibee121ac390892c28d2e6a388e73700a7e69a521 Reviewed-by: Allan Sandfeld Jensen --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b1ca509d..8d761e880 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,13 +107,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}" -- cgit v1.2.3