From 2c070b6f4d24c56a37d5de71e40d435030254be9 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 5 Nov 2021 10:55:48 +0100 Subject: Fix EntryPointMinGW32Target.cmake to be found in top-level build This amends commit 67dadc7e3428169778102a6dfab47e2e48c8d17e. We need to copy EntryPointMinGW32Target.cmake to the build dir. The variable config_install_dir contains path relative to the install prefix, and the copy command needs one relative to the build dir (or an absolute one). Pick-to: 6.2 Fixes: QTBUG-97919 Change-Id: I4e3d735edfb69e27c248191b892422cef572258e Reviewed-by: Alexandru Croitor --- src/entrypoint/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/entrypoint') diff --git a/src/entrypoint/CMakeLists.txt b/src/entrypoint/CMakeLists.txt index 755f12c821..1dc957d82a 100644 --- a/src/entrypoint/CMakeLists.txt +++ b/src/entrypoint/CMakeLists.txt @@ -30,8 +30,10 @@ if(MINGW) # In prefix builds we also need to copy the file into the build config directory, so that the # build-dir Qt6Config.cmake finds the files when building other repos in a top-level build. if(QT_WILL_INSTALL) + get_filename_component(absolute_config_install_dir "${config_install_dir}" ABSOLUTE + BASE_DIR "${QT_BUILD_DIR}") file(COPY "${CMAKE_CURRENT_BINARY_DIR}/${mingw32target_config_file}" - DESTINATION "${config_install_dir}") + DESTINATION "${absolute_config_install_dir}") endif() include("${CMAKE_CURRENT_BINARY_DIR}/${mingw32target_config_file}") set(extra_cmake_includes_arg EXTRA_CMAKE_INCLUDES "${mingw32target_config_file}") -- cgit v1.2.3