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 | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index d76ca34..30188b9 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -13,25 +13,20 @@ windowitemdelegate.cpp kernel/nativeeventfilter_p.h kernel/nativeeventfilter.cpp - kernel/systemwindow_p.h + 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 @@ -54,6 +49,11 @@ contexts/cocoawindowcontext_p.h contexts/cocoawindowcontext.mm ) + list(APPEND _links_private + "-framework Foundation" + "-framework Cocoa" + "-framework AppKit" + ) else() list(APPEND _src contexts/qtwindowcontext_p.h @@ -64,12 +64,11 @@ 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