diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-12-08 12:55:21 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-12-08 15:15:58 +0100 |
| commit | 192d37099da0db1b7bf7452c44daacc19b85094b (patch) | |
| tree | 97e45444b0ac1f06f8191300bccb541bd2421b1c /cmake/QtQmakeHelpers.cmake | |
| parent | cc81aae4b312da40945ddfecb806f4abe6b74048 (diff) | |
CMake: Do not write Effective[Source]Paths to target_qt.conf
This was needed, when the mkspecs directory was not present in the
non-prefix build directory. That's not the case anymore.
Pick-to: 6.0
Fixes: QTBUG-89182
Change-Id: I2b04c2d857b0af324e1d7c41ed1934a62275d6f1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtQmakeHelpers.cmake')
| -rw-r--r-- | cmake/QtQmakeHelpers.cmake | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/cmake/QtQmakeHelpers.cmake b/cmake/QtQmakeHelpers.cmake index 21fc121a8c..c06561b9bd 100644 --- a/cmake/QtQmakeHelpers.cmake +++ b/cmake/QtQmakeHelpers.cmake @@ -141,23 +141,6 @@ Prefix=${prefix} ") endif() - if(NOT QT_WILL_INSTALL) - # The shadow build directory of a non-prefix build does not contain a copy of the mkspecs - # directory. Let $$[QT_HOST_DATA/src] point to the qtbase source directory. - string(APPEND content "[EffectiveSourcePaths] -HostData=${CMAKE_CURRENT_SOURCE_DIR} -") - - # Set $$[QT_HOST_DATA/get] to avoid falling back to the source dir where it isn't explicitly - # requested. - # Also make sure to specify the Prefix as well, because it doesn't get inherited from the - # [Paths] section. - string(APPEND content "[EffectivePaths] -HostData=${ext_prefix} -Prefix=${ext_prefix_relative_to_conf_file} -") - endif() - string(APPEND content "[Paths] Prefix=${ext_prefix_relative_to_conf_file} |