diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-12-07 12:16:50 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-12-07 22:52:28 +0100 |
| commit | bf37104b03b8ed2183d6d30473ae692597cd09cf (patch) | |
| tree | be1f103c4af29e3e34ef423204519d007788eea3 | |
| parent | 522d8e6aceb0ea81e8a419bf1477039cd80ad0b9 (diff) | |
Search PYTHON3_PATH for Python3
Change-Id: If9de5a87ff7c398a198a31fd4fd20858e82bec7e
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| -rw-r--r-- | cmake/Gn.cmake | 6 | ||||
| -rw-r--r-- | configure.cmake | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/cmake/Gn.cmake b/cmake/Gn.cmake index c42eeff35..adeae39fb 100644 --- a/cmake/Gn.cmake +++ b/cmake/Gn.cmake @@ -15,8 +15,10 @@ include(${WEBENGINE_ROOT_SOURCE_DIR}/cmake/Functions.cmake) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) find_package(Gn ${QT_REPO_MODULE_VERSION} EXACT) -find_package(Python3 3.6 REQUIRED) - +find_program(Python3_EXECUTABLE NAMES python3 HINTS $ENV{PYTHON3_PATH}) +if(NOT Python3_EXECUTABLE) + find_package(Python3 3.6 REQUIRED) +endif() set(gnCmd ${Gn_EXECUTABLE}) set(buildDir ${BUILD_DIR}) set(sourceDir ${SOURCE_DIR}) diff --git a/configure.cmake b/configure.cmake index 6cad6a692..397f51f70 100644 --- a/configure.cmake +++ b/configure.cmake @@ -7,7 +7,10 @@ if(QT_CONFIGURE_RUNNING) else() find_package(Ninja 1.7.2) find_package(Gn ${QT_REPO_MODULE_VERSION} EXACT) - find_package(Python3 3.6) + find_program(Python3_EXECUTABLE NAMES python3 HINTS $ENV{PYTHON3_PATH}) + if(NOT Python3_EXECUTABLE) + find_package(Python3 3.6) + endif() find_package(GPerf) find_package(BISON) find_package(FLEX) @@ -48,7 +51,7 @@ if(PkgConfig_FOUND) pkg_check_modules(LIBPCI libpci) endif() -if(Python3_FOUND) +if(Python3_EXECUTABLE) execute_process( COMMAND ${Python3_EXECUTABLE} -c "import html5lib" RESULT_VARIABLE html5lib_NOT_FOUND @@ -392,12 +395,12 @@ add_check_for_support( ) add_check_for_support( MODULES QtWebEngine QtPdf - CONDITION Python3_FOUND + CONDITION Python3_EXECUTABLE MESSAGE "Python version 3.6 or later is required." ) add_check_for_support( MODULES QtWebEngine QtPdf - CONDITION Python3_FOUND AND NOT html5lib_NOT_FOUND + CONDITION Python3_EXECUTABLE AND NOT html5lib_NOT_FOUND MESSAGE "Python3 html5lib is missing." ) add_check_for_support( |