AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Fix configuring Qt with CMake < 3.21 and missing patchelf

Browse Source 
Turn the FATAL_ERROR into a WARNING and explain what patchelf would be
used for.

Also, store the patchelf executable just as "patchelf" if it could not
be found. Now it's possible to install patchelf after configuring a
project.

Fixes: QTBUG-109004
Change-Id: I1e89b4c5851f341e000e563d1437398b454c68f7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2022-11-29 10:17:07 +01:00
parent 84c76d6205
commit 34d7dd908e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/Qt6CoreMacros.cmake
View File

@ -2518,8 +2518,10 @@ function(_qt_internal_setup_deploy_support)
if(QT_DEPLOY_USE_PATCHELF)
find_program(QT_DEPLOY_PATCHELF_EXECUTABLE patchelf)
if(NOT QT_DEPLOY_PATCHELF_EXECUTABLE)
message(FATAL_ERROR "The patchelf executable could not be located. "
"Please install patchelf or upgrade CMake to 3.21 or newer.")
set(QT_DEPLOY_PATCHELF_EXECUTABLE "patchelf")
message(WARNING "The patchelf executable could not be located. "
"To use Qt's CMake deployment API, install patchelf or upgrade CMake to 3.21 "
"or newer.")
endif()
endif()
endif()