From ab86fb046884c5bd85d64ce2e64be83996372f2c Mon Sep 17 00:00:00 2001 From: Rick Vogel Date: Thu, 29 Sep 2022 00:06:44 +0200 Subject: [PATCH] inputcontext compilable --- CMakeLists.txt | 4 ++-- inputcontext/CMakeLists.txt | 32 ++++++++++++++++++++------------ 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d46ce21..cd39f6b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,12 +28,12 @@ message(STATUS "Qt5_VERSION_PATCH: ${Qt5_VERSION_PATCH}") add_subdirectory(src) add_subdirectory(skins) -#TODO -#add_subdirectory(inputcontext) +add_subdirectory(inputcontext) add_subdirectory(qmlexport) add_subdirectory(tools) add_subdirectory(support) add_subdirectory(examples) +#TODO #add_subdirectory(playground) #TODO diff --git a/inputcontext/CMakeLists.txt b/inputcontext/CMakeLists.txt index a694dffa..73da5b68 100644 --- a/inputcontext/CMakeLists.txt +++ b/inputcontext/CMakeLists.txt @@ -1,14 +1,8 @@ -set(TARGET_NAME qskinputcontext) - -target_link_libraries(${TARGET_NAME} PRIVATE gui-private) - # TODO # CONFIG += plugin # CONFIG += qskinny -if(QskDll) - target_compile_definitions(${TARGET_NAME} PRIVATE QSK_INPUTCONTEXT_MAKEDLL) -endif() +set(TARGET_NAME qskinputcontext) list(APPEND TARGET_HEADERS QskInputContextGlobal.h) @@ -19,6 +13,24 @@ list(APPEND TARGET_SOURCES list(APPEND TARGET_OTHER_FILES metadata.json) +add_library(${TARGET_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_OTHER_FILES}) + +if(QskDll) + target_compile_definitions(${TARGET_NAME} + PRIVATE + QSK_INPUTCONTEXT_MAKEDLL) +endif() + +target_link_libraries(${TARGET_NAME} + PRIVATE + qskinny + Qt5::GuiPrivate) + +set_target_properties(${TARGET_NAME} PROPERTIES + AUTOMOC ON) + +install(TARGETS ${TARGET_NAME} DESTINATION ${QSK_INSTALL_PLUGINS}/platforminputcontexts) + # TODO # pinyin { # unix @@ -41,8 +53,4 @@ list(APPEND TARGET_OTHER_FILES # SOURCES += QskHunspellTextPredictor.cpp # } # -# } - -add_library(${TARGET_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_OTHER_FILES}) - -install(TARGETS ${TARGET_NAME} DESTINATION ${QSK_INSTALL_PLUGINS}/platforminputcontexts) \ No newline at end of file +# } \ No newline at end of file