diff options
| -rw-r--r-- | cmake/FindNodejs.cmake | 5 | ||||
| -rw-r--r-- | configure.cmake | 7 |
2 files changed, 12 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}") diff --git a/configure.cmake b/configure.cmake index c5e561b12..57d6c805c 100644 --- a/configure.cmake +++ b/configure.cmake @@ -497,6 +497,13 @@ add_check_for_support( 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 MESSAGE "Python version 3.6 or later is required." |