From 963017f58884dfd929249c5546aadbb0f74501e8 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 26 Feb 2020 11:12:08 +0200 Subject: [PATCH] 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 Reviewed-by: Alexandru Croitor --- cmake/qt.toolchain.cmake.in | 6 +++--- 1 file 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}")