From 245ddfa1f01b4c9fa10337246b8045755e5bcce5 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 19 12月 2023 21:03:58 +0800
Subject: [PATCH] Change back to qScopeGuard
---
src/core/CMakeLists.txt | 57 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 12 deletions(-)
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 7b3d4a4..d76ca34 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -4,46 +4,79 @@
)
set(_src
- qwkcoreglobal.h
- corewindowagent.h
- corewindowagent_p.h
- corewindowagent.cpp
- windowitemdelegate.h
+ qwkglobal.h
+ qwkglobal_p.h
+ windowagentbase.h
+ windowagentbase_p.h
+ windowagentbase.cpp
+ windowitemdelegate_p.h
+ windowitemdelegate.cpp
+ kernel/nativeeventfilter_p.h
+ kernel/nativeeventfilter.cpp
+ kernel/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
- contexts/win32windowcontext_p.h
- contexts/win32windowcontext.cpp
+ )
+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()
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 contexts
+ INCLUDE_PRIVATE kernel contexts platforms
PREFIX QWK_CORE
)
set_target_properties(${PROJECT_NAME} PROPERTIES
CXX_STANDARD 17
CXX_STANDARD_REQUIRED TRUE
-)
\ No newline at end of file
+)
+
+set(QWINDOWKIT_ENABLED_TARGETS ${QWINDOWKIT_ENABLED_TARGETS} ${PROJECT_NAME} PARENT_SCOPE)
+set(QWINDOWKIT_ENABLED_SUBDIRECTORIES ${QWINDOWKIT_ENABLED_SUBDIRECTORIES} core PARENT_SCOPE)
\ No newline at end of file
--
Gitblit v1.9.1