From abdad66bae077da6c3480db457beb47df5eda813 Mon Sep 17 00:00:00 2001
From: SineStriker <trueful@163.com>
Date: 周六, 16 12月 2023 19:27:16 +0800
Subject: [PATCH] Fix mac window mistakes
---
src/core/CMakeLists.txt | 47 +++++++++++++++++++++++++++--------------------
1 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 71c0e72..88d350b 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,8 +11,6 @@
windowagentbase.cpp
windowitemdelegate_p.h
windowitemdelegate.cpp
- kernel/eventobserver_p.h
- kernel/eventobserver.cpp
kernel/nativeeventfilter_p.h
kernel/nativeeventfilter.cpp
contexts/abstractwindowcontext_p.h
@@ -21,36 +18,45 @@
)
set(_defines_private)
+set(_links_private)
if(WIN32)
list(APPEND _src
qwindowkit_windows.h
qwindowkit_windows.cpp
)
-
- 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)
+ list(APPEND _links_private
+ "-framework Foundation"
+ "-framework Cocoa"
+ "-framework AppKit"
+ )
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
+ )
else()
list(APPEND _src
- qwindowkit_linux.h
+ contexts/qtwindowcontext_p.h
+ contexts/qtwindowcontext.cpp
)
endif()
endif()
@@ -59,6 +65,7 @@
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
--
Gitblit v1.9.1