From 4d193ef7c61fb4800868f150be6a0bb04b725463 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 20 2月 2024 15:37:54 +0800
Subject: [PATCH] minor tweaks
---
src/core/CMakeLists.txt | 53 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 34 insertions(+), 19 deletions(-)
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 2123a05..45aa224 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,50 +11,51 @@
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
+ 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
)
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)
+if(QWINDOWKIT_ENABLE_QT_WINDOW_CONTEXT)
list(APPEND _src
contexts/qtwindowcontext_p.h
contexts/qtwindowcontext.cpp
)
- list(APPEND _defines_private QWINDOWKIT_FORCE_QT_WINDOW_CONTEXT)
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
@@ -65,20 +65,35 @@
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 "style/\\.+")
+endif()
+
qwk_add_library(${PROJECT_NAME} AUTOGEN
SOURCES ${_src}
- DEFINES_PRIVATE ${_defines_private}
- 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 kernel contexts shared
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