From 862cbfe3032b1f71977fb66af7bd87645ec3eeac Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周四, 21 12月 2023 23:27:04 +0800
Subject: [PATCH] minor tweaks

---
 src/core/CMakeLists.txt |   53 ++++++++++++++++++++++++++++++-----------------------
 1 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 71c0e72..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,56 +11,64 @@
     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(_defines_private)
+set(_links_private)
 
 if(WIN32)
     list(APPEND _src
         qwindowkit_windows.h
         qwindowkit_windows.cpp
+        shared/qwkwindowsextra_p.h
     )
-
-    if(QWINDOWKIT_FORCE_QT_WINDOW_CONTEXT)
-        list(APPEND _src
-            contexts/qtwindowcontext_p.h
-            contexts/qtwindowcontext.cpp
-        )
-        list(APPEND _defines_private QWINDOWKIT_FORCE_QT_WINDOW_CONTEXT)
-    else()
-        list(APPEND _src
-            contexts/win32windowcontext_p.h
-            contexts/win32windowcontext.cpp
-        )
-    endif()
+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()
 
 qwk_add_library(${PROJECT_NAME} AUTOGEN
     SOURCES ${_src}
-    DEFINES_PRIVATE ${_defines_private}
     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