From 2e6ca4bbc315c71f685d5e07286912f486872f7b Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Fri, 14 Aug 2020 16:30:06 +0200
Subject: CMake: Fix copying of gradle resources in non-prefix builds

Amends b1f8ca8032bd0500f356c55c335937f7fb89d3f5.

Task-number: QTBUG-85399
Change-Id: Ibf0d721a7735dabd48e069a6098d1d9338cde660
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 src/3rdparty/gradle/CMakeLists.txt | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/3rdparty')

diff --git a/src/3rdparty/gradle/CMakeLists.txt b/src/3rdparty/gradle/CMakeLists.txt
index d4eaa60838..a6fbfc962a 100644
--- a/src/3rdparty/gradle/CMakeLists.txt
+++ b/src/3rdparty/gradle/CMakeLists.txt
@@ -1,21 +1,20 @@
 # special case begin
 # special case skip regeneration
 
-install(
+qt_path_join(destination ${QT_INSTALL_DIR} "src/3rdparty/gradle")
+qt_copy_or_install(
     FILES
         gradlew
         gradlew.bat
     DESTINATION
-        src/3rdparty/gradle
-    COMPONENT
-        Devel)
+        "${destination}"
+)
 
-install(
+qt_copy_or_install(
     DIRECTORY
         gradle
     DESTINATION
-        src/3rdparty/gradle
-    COMPONENT
-        Devel)
+        "${destination}"
+)
 
 # special case end
-- 
cgit v1.2.3