diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-10-27 08:50:06 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-10-30 08:23:03 +0100 |
| commit | 4670ef3cc4755f3e2ad20dc1b7eccf5aa8583456 (patch) | |
| tree | 57514723e1744424d984647a7e076da67f70a1b8 | |
| parent | cb7f4030bc89471aa6489be60ac1c728a3dfd06b (diff) | |
CMake: Write INSTALL_MKSPECSDIR to qconfig.cpp
The value of this variable - whithout the mkspecs part - is what's
called the host data dir in Qt5.
Fixes: QTBUG-87681
Change-Id: I3dfeed17e8a614476aef4d9c651a141ce62e6551
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | cmake/QtQmakeHelpers.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cmake/QtQmakeHelpers.cmake b/cmake/QtQmakeHelpers.cmake index dae5af8db9..3b8676bc5f 100644 --- a/cmake/QtQmakeHelpers.cmake +++ b/cmake/QtQmakeHelpers.cmake @@ -25,6 +25,12 @@ function(qt_generate_qconfig_cpp) set(QT_CONFIG_STR_OFFSETS "") set(QT_CONFIG_STRS "") + # Chop off the "/mkspecs" part of INSTALL_MKSPECSDIR + get_filename_component(hostdatadir "${INSTALL_MKSPECSDIR}" DIRECTORY) + if("${hostdatadir}" STREQUAL "") + set(hostdatadir ".") + endif() + # Start first part. qt_add_string_to_qconfig_cpp("${INSTALL_DOCDIR}") qt_add_string_to_qconfig_cpp("${INSTALL_INCLUDEDIR}") @@ -51,7 +57,7 @@ function(qt_generate_qconfig_cpp) qt_add_string_to_qconfig_cpp("false") # qmake_sysrootify qt_add_string_to_qconfig_cpp("${INSTALL_BINDIR}") # TODO: Host-specific qt_add_string_to_qconfig_cpp("${INSTALL_LIBDIR}") # TODO: Host-specific - qt_add_string_to_qconfig_cpp("${INSTALL_DATADIR}") # TODO: Host-specific + qt_add_string_to_qconfig_cpp("${hostdatadir}") qt_add_string_to_qconfig_cpp("${QT_QMAKE_TARGET_MKSPEC}") qt_add_string_to_qconfig_cpp("${QT_QMAKE_HOST_MKSPEC}") |