diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2020-02-26 11:12:08 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2020-02-28 08:31:34 +0200 |
| commit | 963017f58884dfd929249c5546aadbb0f74501e8 (patch) | |
| tree | cd7ce019e1f9586db3a0e0f6aecbeb238a00c566 /cmake | |
| parent | f6f6eab89f57fb0db8f623f4a92a7b9c4ba6e9ea (diff) | |
Prepend prefix path after loading toolchain file
The original toolchain file may set CMAKE_FIND_ROOT_PATH instead of
appending it, which overrides the Qt's path.
Change-Id: I69a4bf4be6a999854bb8a84cf5032c6a9b739b2e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/qt.toolchain.cmake.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/qt.toolchain.cmake.in b/cmake/qt.toolchain.cmake.in index 22bfe6baec..63e5ee3d59 100644 --- a/cmake/qt.toolchain.cmake.in +++ b/cmake/qt.toolchain.cmake.in @@ -1,6 +1,3 @@ -list(APPEND CMAKE_PREFIX_PATH "@CMAKE_INSTALL_PREFIX@") -list(APPEND CMAKE_FIND_ROOT_PATH "@CMAKE_INSTALL_PREFIX@") - @init_platform@ @init_qt_host_path@ @@ -14,6 +11,9 @@ if(qt_chainload_toolchain_file) unset(qt_chainload_toolchain_file) endif() +list(PREPEND CMAKE_PREFIX_PATH "@CMAKE_INSTALL_PREFIX@") +list(PREPEND CMAKE_FIND_ROOT_PATH "@CMAKE_INSTALL_PREFIX@") + if(QT_HOST_PATH) list(APPEND CMAKE_PREFIX_PATH "${QT_HOST_PATH}") list(APPEND CMAKE_FIND_ROOT_PATH "${QT_HOST_PATH}") |