From f2ce80e0c69730a9e4bd7aa6cb366f5a75a615c6 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Wed, 12 Jun 2019 17:22:30 +0200 Subject: [PATCH] CMake build: Copy fonts and syntax-highlighting files to builddir Fixes: QTCREATORBUG-22472 Change-Id: Ib812690c70efdc0ad7b125f6ce9623ca500d698d Reviewed-by: Tobias Hunger --- src/libs/3rdparty/syntax-highlighting/CMakeLists.txt | 11 ++++++++++- src/share/3rdparty/CMakeLists.txt | 9 +++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt b/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt index e8498150989..27cc4082230 100644 --- a/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt +++ b/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt @@ -33,6 +33,15 @@ add_qtc_library(KSyntaxHighlighting STATIC ) install( - DIRECTORY data/ + DIRECTORY data/syntax DESTINATION "${IDE_DATA_PATH}/generic-highlighter/" ) + +add_custom_target(copy_generic_highligher_to_builddir ALL VERBATIM) +add_custom_command(TARGET copy_generic_highligher_to_builddir POST_BUILD + COMMAND "${CMAKE_COMMAND}" -E copy_directory data/syntax + "${PROJECT_BINARY_DIR}/${IDE_DATA_PATH}/generic-highlighter/syntax" + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + COMMENT Copy files into build directory + VERBATIM +) diff --git a/src/share/3rdparty/CMakeLists.txt b/src/share/3rdparty/CMakeLists.txt index 39791681244..ede2157426e 100644 --- a/src/share/3rdparty/CMakeLists.txt +++ b/src/share/3rdparty/CMakeLists.txt @@ -2,3 +2,12 @@ install( DIRECTORY fonts DESTINATION "${IDE_DATA_PATH}" ) + +add_custom_target(copy_fonts_to_builddir ALL VERBATIM) +add_custom_command(TARGET copy_fonts_to_builddir POST_BUILD + COMMAND "${CMAKE_COMMAND}" -E copy_directory fonts + "${PROJECT_BINARY_DIR}/${IDE_DATA_PATH}/fonts" + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + COMMENT Copy files into build directory + VERBATIM +)