diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-12-08 12:55:21 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-12-08 16:32:24 +0000 |
| commit | 491cb6b17ec2d5cd18db402897ba77f99306015d (patch) | |
| tree | d3df1d58070f6517c9ae4a437b8b7f6628ce7a41 /cmake | |
| parent | 49f27c0eaa82f9943035581a0a3bef33c00a7b25 (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.
Fixes: QTBUG-89182
Change-Id: I2b04c2d857b0af324e1d7c41ed1934a62275d6f1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 192d37099da0db1b7bf7452c44daacc19b85094b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to '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} |