From c90d5e7420e02c6e9e4df6fb5c57f877efb73b61 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Tue, 6 Jul 2021 15:50:06 +0200 Subject: [PATCH] Fix platform definition directory in top-level build QT_BUILD_DIR should be used instead of CMAKE_BINARY_DIR as a base directory for platform definition when building a non-prefixed build since artifacts are copied to qtbase directory for top-level build. Amends 478f5fcde66a49b710c427447916a0ee0e4d9e0a Task-number: QTBUG-94973 Change-Id: I5cce16fdc7f760b954222ae67a4b85d4beea7f13 Reviewed-by: Alexandru Croitor (cherry picked from commit 9bbca531ebe498afa10d9a1c02518fcfc54490a2) --- cmake/QtBuild.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 8ae9714fa1c..3c24dff741a 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -342,7 +342,7 @@ set(QT_PLATFORM_DEFINITION_BUILD_INTERFACE_BASE_DIR # Used by qtbase and consumers in non-prefix builds via BUILD_INTERFACE if(NOT QT_WILL_INSTALL) set(QT_PLATFORM_DEFINITION_BUILD_INTERFACE_BASE_DIR - "${CMAKE_BINARY_DIR}/${INSTALL_MKSPECSDIR}" + "${QT_BUILD_DIR}/${INSTALL_MKSPECSDIR}" ) endif()