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

CMake: Map configure -hostdatadir to INSTALL_MKSPECSDIR

Browse Source 
In the qmake-based build, the hostdatadir is the directory where "Data
used by qmake" is located. In the CMake build the equivalent is
INSTALL_MKSPECSDIR. Create the mapping accordingly.

Fixes: QTBUG-88211
Change-Id: I9e3d1af24bc7f41333ef2269fced5ab3fcfa848d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2020-11-10 15:31:55 +01:00
parent bd6784b579
commit 88efeb9e25
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/QtProcessConfigureArgs.cmake
View File

@ -75,6 +75,12 @@ while(configure_args)
elseif(arg STREQUAL "-qt-host-path") elseif(arg STREQUAL "-qt-host-path")
pop_path_argument() pop_path_argument()
push("-DQT_HOST_PATH=${path}") push("-DQT_HOST_PATH=${path}")
elseif(arg STREQUAL "-hostdatadir")
pop_path_argument()
if(NOT path MATCHES "(^|/)mkspecs$")
string(APPEND path "/mkspecs")
endif()
push("-DINSTALL_MKSPECSDIR=${path}")
elseif(arg MATCHES "^-host.*dir") elseif(arg MATCHES "^-host.*dir")
message(FATAL_ERROR "${arg} is not supported anymore.") message(FATAL_ERROR "${arg} is not supported anymore.")
elseif(arg STREQUAL "--") elseif(arg STREQUAL "--")

1
cmake/configure-cmake-mapping.md
View File

@ -9,6 +9,7 @@ The effort of this is tracked in QTBUG-85373 and QTBUG-85349.
| -hostprefix /where/ever | n/a | When cross-building Qt, we do not build for host system anymore | | -hostprefix /where/ever | n/a | When cross-building Qt, we do not build for host system anymore |
| -external-hostbindir /path/to/host/qt | -DQT_HOST_PATH=/path/to/host/qt | | | -external-hostbindir /path/to/host/qt | -DQT_HOST_PATH=/path/to/host/qt | |
| -bindir <dir> | -DINSTALL_BINDIR=<dir> | similar for -headerdir -libdir and so on | | -bindir <dir> | -DINSTALL_BINDIR=<dir> | similar for -headerdir -libdir and so on |
| -hostdatadir <dir> | -DINSTALL_MKSPECSDIR=<dir> | |
| -host*dir <dir> | n/a | | | -host*dir <dir> | n/a | |
| -help | n/a | Handled by configure[.bat]. | | -help | n/a | Handled by configure[.bat]. |
| -verbose | | | | -verbose | | |