From e95e2bfd29b64d3144515c30fb9cf76adb75c6c3 Mon Sep 17 00:00:00 2001 From: Sine Striker <trueful@163.com> Date: 周二, 07 5月 2024 21:44:21 +0800 Subject: [PATCH] minor tweaks --- src/core/CMakeLists.txt | 75 +++++++++++++++++++++++++++++-------- 1 files changed, 59 insertions(+), 16 deletions(-) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index c3e7cf1..9abe22e 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -4,7 +4,6 @@ ) set(_src - qwkcoreglobal.h qwkglobal.h qwkglobal_p.h windowagentbase.h @@ -12,48 +11,92 @@ windowagentbase.cpp windowitemdelegate_p.h windowitemdelegate.cpp - kernel/eventobserver_p.h - kernel/eventobserver.cpp kernel/nativeeventfilter_p.h kernel/nativeeventfilter.cpp + kernel/sharedeventfilter_p.h + kernel/sharedeventfilter.cpp + kernel/winidchangeeventfilter_p.h + kernel/winidchangeeventfilter.cpp + shared/systemwindow_p.h contexts/abstractwindowcontext_p.h contexts/abstractwindowcontext.cpp ) + +set(_links_private) if(WIN32) list(APPEND _src qwindowkit_windows.h qwindowkit_windows.cpp - contexts/win32windowcontext_p.h - contexts/win32windowcontext.cpp + shared/qwkwindowsextra_p.h + shared/windows10borderhandler_p.h ) +elseif(APPLE) else() + list(APPEND _src + qwindowkit_linux.h + ) +endif() + +if(QWINDOWKIT_ENABLE_QT_WINDOW_CONTEXT) list(APPEND _src contexts/qtwindowcontext_p.h contexts/qtwindowcontext.cpp ) - - if(APPLE) - # add files +else() + if(WIN32) + list(APPEND _src + contexts/win32windowcontext_p.h + contexts/win32windowcontext.cpp + ) + list(APPEND _links_private uxtheme) + elseif(APPLE) + list(APPEND _src + contexts/cocoawindowcontext_p.h + contexts/cocoawindowcontext.mm + ) + list(APPEND _links_private + "-framework Foundation" + "-framework Cocoa" + "-framework AppKit" + ) else() list(APPEND _src - qwindowkit_linux.h + contexts/qtwindowcontext_p.h + contexts/qtwindowcontext.cpp ) endif() endif() +set(_sync_include_options) + +if(QWINDOWKIT_ENABLE_STYLE_AGENT) + list(APPEND _src + style/styleagent.h + style/styleagent_p.h + style/styleagent.cpp + ) + + if(WIN32) + list(APPEND _src style/styleagent_win.cpp) + elseif(APPLE) + list(APPEND _src style/styleagent_mac.mm) + else() + list(APPEND _src style/styleagent_linux.cpp) + endif() +else() + list(APPEND _sync_include_options EXCLUDE "src/core/style/\\.+") +endif() + qwk_add_library(${PROJECT_NAME} AUTOGEN SOURCES ${_src} - LINKS + FEATURES cxx_std_17 + LINKS_PRIVATE ${_links_private} QT_LINKS Core Gui QT_INCLUDE_PRIVATE Core Gui - INCLUDE_PRIVATE kernel contexts platforms + INCLUDE_PRIVATE * PREFIX QWK_CORE -) - -set_target_properties(${PROJECT_NAME} PROPERTIES - CXX_STANDARD 17 - CXX_STANDARD_REQUIRED TRUE + SYNC_INCLUDE_OPTIONS ${_sync_include_options} ) set(QWINDOWKIT_ENABLED_TARGETS ${QWINDOWKIT_ENABLED_TARGETS} ${PROJECT_NAME} PARENT_SCOPE) -- Gitblit v1.9.1