From fc94174bf74bb9a6a51df4bc75443cffd6b27d23 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Mon, 27 Apr 2020 10:10:25 +0200
Subject: [PATCH] CMake build: Fix copying & installation of resources

- just copy & install whole directories, like the qmake build (basically)
- copy & install scripts/ only on macOS
- do not copy or install welcomescreen/ which is no longer used

Fixes: QTCREATORBUG-23907
Fixes: QTCREATORBUG-23909
Fixes: QTCREATORBUG-23911
Change-Id: I0f9016848d15b214c40f454f39c5560d1faa4f32
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
---
 share/qtcreator/CMakeLists.txt | 35 +++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/share/qtcreator/CMakeLists.txt b/share/qtcreator/CMakeLists.txt
index 05f64cc2f15..303fb9c7d0b 100644
--- a/share/qtcreator/CMakeLists.txt
+++ b/share/qtcreator/CMakeLists.txt
@@ -1,25 +1,42 @@
-set(template_directories android cplusplus debugger glsl modeleditor qml qmldesigner
-  qmlicons qml-type-descriptions schemes scripts snippets styles templates themes welcomescreen)
+set(resource_directories
+  android
+  cplusplus
+  debugger
+  glsl
+  indexer_preincludes
+  modeleditor
+  qml
+  qmldesigner
+  qmlicons
+  qml-type-descriptions
+  schemes
+  snippets
+  styles
+  templates
+  themes
+)
+
+if (APPLE)
+  set(resource_directories ${resource_directories} scripts)
+endif()
 
 add_custom_target(copy_share_to_builddir ALL
   COMMENT Copy files into build directory
   VERBATIM
 )
 
-foreach(dir IN ITEMS ${template_directories})
+# copy resource directories during build
+foreach(dir IN ITEMS ${resource_directories})
   add_custom_command(TARGET copy_share_to_builddir POST_BUILD
     COMMAND "${CMAKE_COMMAND}" -E copy_directory "${dir}"
       "${PROJECT_BINARY_DIR}/${IDE_DATA_PATH}/${dir}"
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-    COMMENT Copy files into build directory
+    COMMENT Copy resource directories into build directory
     VERBATIM
   )
 endforeach()
 
-install(DIRECTORY ${template_directories} DESTINATION "${IDE_DATA_PATH}")
-install(
-  FILES indexer_preincludes/qglobal.h indexer_preincludes/windows.h
-  DESTINATION "${IDE_DATA_PATH}/indexer_preincludes"
-)
+# create install rule for resource directories
+install(DIRECTORY ${resource_directories} DESTINATION "${IDE_DATA_PATH}")
 
 add_subdirectory(translations)