1 files changed, 38 insertions, 18 deletions
diff --git a/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt b/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt
index d8d64bcdd7..ce22946d84 100644
--- a/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt
+++ b/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt
@@ -1,10 +1,21 @@
-add_qtc_library(KSyntaxHighlighting STATIC
-  PUBLIC_INCLUDES autogenerated/ autogenerated/src/lib src/lib
-  PUBLIC_DEFINES KSYNTAXHIGHLIGHTING_LIBRARY
-  DEPENDS Qt5::Network Qt5::Widgets
+if(TARGET KF5::SyntaxHighlighting)
+  set(HIGHLIGHTING_BUILD_DEFAULT OFF)
+else()
+  set(HIGHLIGHTING_BUILD_DEFAULT ON)
+endif()
+
+add_qtc_library(KSyntaxHighlighting
+  BUILD_DEFAULT ${HIGHLIGHTING_BUILD_DEFAULT}
+  INCLUDES autogenerated/
+  PUBLIC_INCLUDES
+    src/lib
+    autogenerated/include
+    autogenerated/src/lib
+  DEPENDS Qt::Network Qt::Widgets
   SOURCES
     autogenerated/src/lib/ksyntaxhighlighting_logging.cpp autogenerated/src/lib/ksyntaxhighlighting_logging.h
     autogenerated/ksyntaxhighlighting_version.h
+    autogenerated/src/lib/ksyntaxhighlighting_export.h
 
     data/themes/theme-data.qrc
 
@@ -15,11 +26,12 @@ add_qtc_library(KSyntaxHighlighting STATIC
     src/lib/definitiondownloader.cpp src/lib/definitiondownloader.h
     src/lib/definitionref_p.h
     src/lib/definition_p.h
+    src/lib/dynamicregexpcache_p.h
     src/lib/foldingregion.cpp src/lib/foldingregion.h
     src/lib/format.cpp src/lib/format.h src/lib/format_p.h
     src/lib/htmlhighlighter.cpp src/lib/htmlhighlighter.h
+    src/lib/highlightingdata.cpp src/lib/highlightingdata_p.hpp
     src/lib/keywordlist.cpp src/lib/keywordlist_p.h
-    src/lib/ksyntaxhighlighting_export.h
     src/lib/matchresult_p.h
     src/lib/repository.cpp src/lib/repository.h src/lib/repository_p.h
     src/lib/rule.cpp src/lib/rule_p.h
@@ -28,20 +40,28 @@ add_qtc_library(KSyntaxHighlighting STATIC
     src/lib/textstyledata_p.h
     src/lib/theme.cpp src/lib/theme.h
     src/lib/themedata.cpp src/lib/themedata_p.h
-    src/lib/wildcardmatcher.cpp src/lib/wildcardmatcher_p.h
+    src/lib/wildcardmatcher.cpp
+    src/lib/worddelimiters.cpp src/lib/worddelimiters_p.h
     src/lib/xml_p.h
 )
 
-install(
-  DIRECTORY data/syntax
-  DESTINATION "${IDE_DATA_PATH}/generic-highlighter/"
-)
+set(export_symbol_declaration DEFINES KF6SyntaxHighlighting_EXPORTS)
+if (QTC_STATIC_BUILD)
+  set(export_symbol_declaration PUBLIC_DEFINES KSYNTAXHIGHLIGHTING_STATIC_DEFINE)
+endif()
+extend_qtc_library(KSyntaxHighlighting ${export_symbol_declaration})
 
-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
-)
+qtc_add_public_header(autogenerated/include/KSyntaxHighlighting/State)
+
+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"
+  )
+endif()