feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

cmake build: Don't install highlighting files when using system lib

Browse Source 
When using the system provided KF5SyntaxHighlighting library,
the highlighting files are taken from the system too.

Fixes: QTCREATORBUG-25143
Change-Id: Iac0b9734bc96e1f72d1494622081da7e279e5554
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Eike Ziller
2020-12-18 15:07:10 +01:00
parent f74b317598
commit c650c9473d
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/libs/3rdparty/syntax-highlighting/CMakeLists.txt vendored
View File

@@ -44,13 +44,15 @@ add_qtc_library(KSyntaxHighlighting SHARED
)
qtc_add_public_header(autogenerated/src/lib/State)
install(
DIRECTORY data/syntax
DESTINATION "${IDE_DATA_PATH}/generic-highlighter/"
)
if(TARGET KSyntaxHighlighting)
install(
DIRECTORY data/syntax
DESTINATION "${IDE_DATA_PATH}/generic-highlighter/"
)
# copy resource directories during build
qtc_copy_to_builddir(copy_generic_highligher_to_builddir
DIRECTORIES data/syntax
DESTINATION "${IDE_DATA_PATH}/generic-highlighter/syntax"
)
# copy resource directories during build
qtc_copy_to_builddir(copy_generic_highligher_to_builddir
DIRECTORIES data/syntax
DESTINATION "${IDE_DATA_PATH}/generic-highlighter/syntax"
)
endif()