1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix framework path for *_header_check targets

Browse Source 
When building a Qt module against an installer-provided Qt on macOS, the
module pulls in the headersclean feature that creates the *_header_check
targets. Those targets try to compile the public headers of the module,
and the compilation command contains the -iframework argument. That
-iframework argument is supposed to point to the directory where the Qt
libs are installed. However, it pointed to the original
CMAKE_INSTALL_PREFIX of the machine where Qt was packaged.

Use the QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX variable instead
that contains the real installation location, even for an
installer-provided Qt.

Pick-to: 6.0
Fixes: QTBUG-90402
Change-Id: I27de8b3cc816488c2716042383b334d5c421452d
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Joerg Bornemann 2021-01-19 17:17:40 +01:00
parent 45dc973d96
commit bd8d74e0e2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtHeadersClean.cmake
View File

@ -157,7 +157,7 @@ function(qt_internal_add_headers_clean_target
# For some reason CMake doesn't generate -iframework flags from the INCLUDE_DIRECTORIES # For some reason CMake doesn't generate -iframework flags from the INCLUDE_DIRECTORIES
# generator expression we provide, so pass it explicitly and hope for the best. # generator expression we provide, so pass it explicitly and hope for the best.
list(APPEND framework_includes list(APPEND framework_includes
"-iframework" "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBDIR}") "-iframework" "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_LIBDIR}")
endif() endif()
foreach(header ${hclean_headers}) foreach(header ${hclean_headers})