From 06846a6525c506599382e939210a0d0f60e92e1a Mon Sep 17 00:00:00 2001 From: Martin Marmsoler Date: Fri, 28 Jan 2022 08:22:23 +0100 Subject: [PATCH] split scintilla in scintilla and lexilla --- dep/scintilla/CMakeLists.txt | 43 +++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/dep/scintilla/CMakeLists.txt b/dep/scintilla/CMakeLists.txt index 8a5b8a62..0693612a 100644 --- a/dep/scintilla/CMakeLists.txt +++ b/dep/scintilla/CMakeLists.txt @@ -1,7 +1,24 @@ set(SCINTILLA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lexilla) -add_library( - scintilla +add_library(lexilla + ${SCINTILLA_DIR}/lexlib/Accessor.cxx + ${SCINTILLA_DIR}/lexlib/CharacterCategory.cxx + ${SCINTILLA_DIR}/lexlib/CharacterSet.cxx + ${SCINTILLA_DIR}/lexlib/LexerBase.cxx + ${SCINTILLA_DIR}/lexlib/LexerModule.cxx + ${SCINTILLA_DIR}/lexlib/LexerSimple.cxx + ${SCINTILLA_DIR}/lexlib/PropSetSimple.cxx + ${SCINTILLA_DIR}/lexlib/StyleContext.cxx + ${SCINTILLA_DIR}/lexlib/WordList.cxx + ) + +target_include_directories(lexilla + PUBLIC + ${SCINTILLA_DIR}/lexlib + ${SCINTILLA_DIR}/include +) + +add_library(scintilla ${SCINTILLA_DIR}/src/AutoComplete.cxx ${SCINTILLA_DIR}/src/CallTip.cxx ${SCINTILLA_DIR}/src/CaseConvert.cxx @@ -31,26 +48,22 @@ add_library( ${SCINTILLA_DIR}/src/UniqueString.cxx ${SCINTILLA_DIR}/src/ViewStyle.cxx ${SCINTILLA_DIR}/src/XPM.cxx - ${SCINTILLA_DIR}/lexlib/Accessor.cxx - ${SCINTILLA_DIR}/lexlib/CharacterCategory.cxx - ${SCINTILLA_DIR}/lexlib/CharacterSet.cxx - ${SCINTILLA_DIR}/lexlib/LexerBase.cxx - ${SCINTILLA_DIR}/lexlib/LexerModule.cxx - ${SCINTILLA_DIR}/lexlib/LexerSimple.cxx - ${SCINTILLA_DIR}/lexlib/PropSetSimple.cxx - ${SCINTILLA_DIR}/lexlib/StyleContext.cxx - ${SCINTILLA_DIR}/lexlib/WordList.cxx) +) target_compile_definitions( scintilla PUBLIC SCINTILLA_QT SCI_LEXER PRIVATE SCI_EMPTYCATALOGUE) -target_include_directories( - scintilla PUBLIC ${SCINTILLA_DIR}/include ${SCINTILLA_DIR}/lexlib - ${SCINTILLA_DIR}/src) +target_include_directories(scintilla + PUBLIC + ${SCINTILLA_DIR}/src +) -target_link_libraries(scintilla Qt5::Widgets) +target_link_libraries(scintilla + Qt5::Widgets + lexilla +) set_target_properties(scintilla PROPERTIES AUTOMOC ON)