From 2c80ff478bcc3290cafd970c5fd3412f2887fc91 Mon Sep 17 00:00:00 2001 From: Martin Negyokru Date: Fri, 31 Mar 2023 14:37:07 +0200 Subject: Add check for Nodejs binary version Webengine fails to build with 32bit Nodejs. It crashes on devtools-frontend/src/scripts/build/compress_files.js. Add configure time check for node binary. Task-number: QTBUG-111852 Change-Id: I80844e36d5ae4621e2dae6fe61de883580b56a57 Reviewed-by: Allan Sandfeld Jensen --- cmake/FindNodejs.cmake | 5 +++++ configure.cmake | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/cmake/FindNodejs.cmake b/cmake/FindNodejs.cmake index 0aeef5ab3..00ce5696c 100644 --- a/cmake/FindNodejs.cmake +++ b/cmake/FindNodejs.cmake @@ -9,6 +9,11 @@ if(Nodejs_EXECUTABLE) OUTPUT_VARIABLE Nodejs_VERSION ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) + + execute_process( + COMMAND ${Nodejs_EXECUTABLE} -p "process.arch" + OUTPUT_VARIABLE Nodejs_ARCH + OUTPUT_STRIP_TRAILING_WHITESPACE) endif() string (REGEX MATCHALL "([1-9][0-9])\..*" Nodejs_VERSION "${Nodejs_VERSION}") diff --git a/configure.cmake b/configure.cmake index c5e561b12..57d6c805c 100644 --- a/configure.cmake +++ b/configure.cmake @@ -496,6 +496,13 @@ add_check_for_support( CONDITION TARGET Nodejs::Nodejs MESSAGE "node.js version 12 or later is required." ) +add_check_for_support( + MODULES QtWebEngine + CONDITION NOT (Nodejs_ARCH STREQUAL ia32) AND + NOT (Nodejs_ARCH STREQUAL x86) AND + NOT (Nodejs_ARCH STREQUAL arm) + MESSAGE "32bit version of Nodejs is not supported." +) add_check_for_support( MODULES QtWebEngine QtPdf CONDITION Python3_EXECUTABLE -- cgit v1.2.3