diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-11-05 10:55:48 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-11-08 14:23:21 +0000 |
| commit | 8e0ba3ca017667bdeb6c1a64ca3b8223f21c1cda (patch) | |
| tree | 44cf3c7e7cb6679db7c74abfeed4a3d198d406fa /src | |
| parent | 9738ef61c4e91523ba2dc41947cdf88269b1bc38 (diff) | |
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).
Fixes: QTBUG-97919
Change-Id: I4e3d735edfb69e27c248191b892422cef572258e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 2c070b6f4d24c56a37d5de71e40d435030254be9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/entrypoint/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
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}") |