diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2021-09-08 22:26:39 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-10 15:20:35 +0000 |
| commit | db72fec840b5821d03b90d33260be42f69217845 (patch) | |
| tree | df8f57b09038e0f50c769314b27ee99570585fac | |
| parent | 2bca82219403b35f5d6c30186d1d1ba451af8d4c (diff) | |
Fix rsp workaround for super build
Since 9f4914248 we have poor man workaround for
broken rsp files on windows with cmake. It requires
copy of rsp files to directory where the linker call
takes place. Adjust the output directory for
super build.
Fixes: QTBUG-96266
Change-Id: Ib09add2d6069782ba25a820e950759932eefc457
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 16b2059e0c1990e1533e4222da5f899650e4078e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | cmake/Functions.cmake | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake index 8e466cdea..26e5c1900 100644 --- a/cmake/Functions.cmake +++ b/cmake/Functions.cmake @@ -355,15 +355,20 @@ function(copy_response_files target) foreach(rsp IN ITEMS ${ARGN}) set(rsp_dst "CMakeFiles_${ninjaTarget}_${config}_${rsp}.rsp") set(rsp_src "${${rsp}_rsp}") + if(NOT QT_SUPERBUILD) + set(rsp_output ${PROJECT_BINARY_DIR}/${rsp_dst}) + else() + set(rsp_output ${PROJECT_BINARY_DIR}/../${rsp_dst}) + endif() add_custom_command( - OUTPUT ${PROJECT_BINARY_DIR}/${rsp_dst} - COMMAND ${CMAKE_COMMAND} -E copy ${rsp_src} ${PROJECT_BINARY_DIR}/${rsp_dst} + OUTPUT ${rsp_output} + COMMAND ${CMAKE_COMMAND} -E copy ${rsp_src} ${rsp_output} DEPENDS ${rsp_src} USES_TERMINAL ) set(${rsp}_rsp ${rsp_dst} PARENT_SCOPE) add_custom_target(${cmakeTarget}_${rsp}_copy_${config} - DEPENDS ${PROJECT_BINARY_DIR}/${rsp_dst} + DEPENDS ${rsp_output} ) add_dependencies(${cmakeTarget} ${cmakeTarget}_${rsp}_copy_${config}) endforeach() |