From 486ec4239a34e55e1722e6afcb42b45e067837a5 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 16 May 2022 10:17:21 +0200 Subject: [PATCH] CMake build: List debugger resources explicitly Developing these files can lead to .swp files from other editors, and .pyc files when running python files. When these are later removed, CMake complains about removed dependencies. List the files to copy & install explicitly to workaround this. Change-Id: Ie971abad8e9be0d2d7de94caf8836664396885b0 Reviewed-by: Reviewed-by: Qt CI Bot Reviewed-by: Cristian Adam --- share/qtcreator/CMakeLists.txt | 39 +++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/share/qtcreator/CMakeLists.txt b/share/qtcreator/CMakeLists.txt index 667ef9259c1..a705c7bcb8d 100644 --- a/share/qtcreator/CMakeLists.txt +++ b/share/qtcreator/CMakeLists.txt @@ -1,7 +1,6 @@ set(resource_directories android cplusplus - debugger glsl indexer_preincludes modeleditor @@ -16,6 +15,28 @@ set(resource_directories themes ) +set(resource_files + debugger/.pylintrc + debugger/boosttypes.py + debugger/cdbbridge.py + debugger/creatortypes.py + debugger/dumper.py + debugger/gdbbridge.py + debugger/gdbtracepoint.py + debugger/LICENSE.GPL3-EXCEPT + debugger/lldbbridge.py + debugger/misctypes.py + debugger/opencvtypes.py + debugger/pdbbridge.py + debugger/personaltypes.py + debugger/qttypes.py + debugger/qttypes.py + debugger/README.txt + debugger/setup.cfg + debugger/stdtypes.py + debugger/utils.py +) + if (APPLE) set(resource_directories ${resource_directories} scripts) endif() @@ -27,6 +48,12 @@ qtc_copy_to_builddir(copy_share_to_builddir CREATE_SUBDIRS ) +# copy resource files during build +qtc_copy_to_builddir(copy_share_files_to_builddir + FILES ${resource_files} + DESTINATION ${IDE_DATA_PATH} +) + # create install rule for resource directories install( DIRECTORY ${resource_directories} @@ -34,4 +61,14 @@ install( USE_SOURCE_PERMISSIONS ) +# create install rule for resource files +foreach(file ${resource_files}) + get_filename_component(path "${file}" DIRECTORY) + install( + FILES "${file}" + DESTINATION "${IDE_DATA_PATH}/${path}" + ) +endforeach() + + add_subdirectory(translations)