diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-10 15:31:55 +0100 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-10 18:06:54 +0100 |
commit | 88efeb9e258a473ca5f98eaf2ee25719e23263fd (patch) | |
tree | 39ed162951b1dbd6c79e7020721a75fcff9b9290 | |
parent | bd6784b57909a87134c8bb5ddec73b27b8f1260b (diff) |
CMake: Map configure -hostdatadir to INSTALL_MKSPECSDIR
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>
-rw-r--r-- | cmake/QtProcessConfigureArgs.cmake | 6 | ||||
-rw-r--r-- | cmake/configure-cmake-mapping.md | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake index cb92c0fbca..8fb8d2f6a5 100644 --- a/cmake/QtProcessConfigureArgs.cmake +++ b/cmake/QtProcessConfigureArgs.cmake @@ -75,6 +75,12 @@ while(configure_args) elseif(arg STREQUAL "-qt-host-path") pop_path_argument() 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") message(FATAL_ERROR "${arg} is not supported anymore.") elseif(arg STREQUAL "--") diff --git a/cmake/configure-cmake-mapping.md b/cmake/configure-cmake-mapping.md index a1f5006d4d..b5e528f1e2 100644 --- a/cmake/configure-cmake-mapping.md +++ b/cmake/configure-cmake-mapping.md @@ -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 | | -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 | +| -hostdatadir <dir> | -DINSTALL_MKSPECSDIR=<dir> | | | -host*dir <dir> | n/a | | | -help | n/a | Handled by configure[.bat]. | | -verbose | | | |