From d0427fc068eaacc371041e45adabab39b69c3a26 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 31 May 2019 14:23:47 +0200 Subject: [PATCH] CMake: Add a custom target to copy share/qtcreator into build folder Change-Id: Iae78b8a154c80f26f08d5512c089f7eb802d3662 Reviewed-by: Cristian Adam Reviewed-by: Eike Ziller --- share/qtcreator/CMakeLists.txt | 21 +++++++++++++++++---- src/app/CMakeLists.txt | 5 ----- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/share/qtcreator/CMakeLists.txt b/share/qtcreator/CMakeLists.txt index 6b432ef96c0..3fe6c60b4b5 100644 --- a/share/qtcreator/CMakeLists.txt +++ b/share/qtcreator/CMakeLists.txt @@ -1,9 +1,22 @@ -install( - DIRECTORY cplusplus debugger glsl modeleditor qml qmldesigner - qmlicons qml-type-descriptions schemes snippets styles templates themes welcomescreen - DESTINATION "${IDE_DATA_PATH}" +set(template_directories cplusplus debugger glsl modeleditor qml qmldesigner + qmlicons qml-type-descriptions schemes snippets styles templates themes welcomescreen) + +add_custom_target(copy_share_to_builddir ALL + COMMENT Copy files into build directory + VERBATIM ) +foreach(dir IN ITEMS ${template_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 + 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" diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index e44e544784b..0ef67b2943c 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -33,11 +33,6 @@ if (WIN32) target_sources(qtcreator PRIVATE qtcreator.rc) endif() -add_custom_command(TARGET qtcreator POST_BUILD - COMMAND "${CMAKE_COMMAND}" -E copy_directory - "${PROJECT_SOURCE_DIR}/share/qtcreator" - "${PROJECT_BINARY_DIR}/${IDE_DATA_PATH}") - if (APPLE) set_target_properties(qtcreator PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/app-Info.plist"