diff options
| author | Cristian Adam <cristian.adam@gmail.com> | 2019-06-12 17:22:30 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-06-13 14:25:50 +0000 |
| commit | f2ce80e0c69730a9e4bd7aa6cb366f5a75a615c6 (patch) | |
| tree | 2d52ac86b33f2a278da6ff221dfe5ce87ababccd | |
| parent | 0b2b21bb22549a21f83233a92ca0a7e7e415173c (diff) | |
| download | qt-creator-f2ce80e0c69730a9e4bd7aa6cb366f5a75a615c6.tar.gz | |
CMake build: Copy fonts and syntax-highlighting files to builddir
Fixes: QTCREATORBUG-22472
Change-Id: Ib812690c70efdc0ad7b125f6ce9623ca500d698d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| -rw-r--r-- | src/libs/3rdparty/syntax-highlighting/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/share/3rdparty/CMakeLists.txt | 9 |
2 files changed, 19 insertions, 1 deletions
diff --git a/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt b/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt index e849815098..27cc408223 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 3979168124..ede2157426 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 +) |