summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorMartin Negyokru <negyokru@inf.u-szeged.hu>2023-03-31 14:37:07 +0200
committerMartin Negyokru <negyokru@inf.u-szeged.hu>2023-04-17 14:36:53 +0200
commit2c80ff478bcc3290cafd970c5fd3412f2887fc91 (patch)
tree6e0e8105bd2a56321d8d5522f7b49254f6517845 /cmake
parenta6a97f23bcebfc7c3319607b612be3b0d59ea46f (diff)
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 <allan.jensen@qt.io>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/FindNodejs.cmake5
1 files changed, 5 insertions, 0 deletions
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}")