From 327055934009dc416be6234db8e4d26fab81fb80 Mon Sep 17 00:00:00 2001 From: SineStriker <55847490+SineStriker@users.noreply.github.com> Date: ćšć, 21 12æ 2023 23:21:28 +0800 Subject: [PATCH] Merge pull request #8 from stdware/stylesupport --- src/core/CMakeLists.txt | 41 +++++++++++++++++++++++++++++++---------- 1 files changed, 31 insertions(+), 10 deletions(-) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index c3e7cf1..30188b9 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,32 +11,53 @@ windowagentbase.cpp windowitemdelegate_p.h windowitemdelegate.cpp - kernel/eventobserver_p.h - kernel/eventobserver.cpp kernel/nativeeventfilter_p.h kernel/nativeeventfilter.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 ) +elseif(APPLE) else() + list(APPEND _src + qwindowkit_linux.h + ) +endif() + +if(QWINDOWKIT_FORCE_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 + ) + 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() @@ -45,9 +65,10 @@ qwk_add_library(${PROJECT_NAME} AUTOGEN SOURCES ${_src} LINKS + LINKS_PRIVATE ${_links_private} QT_LINKS Core Gui QT_INCLUDE_PRIVATE Core Gui - INCLUDE_PRIVATE kernel contexts platforms + INCLUDE_PRIVATE kernel contexts shared PREFIX QWK_CORE ) -- Gitblit v1.9.1