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

---
 src/CMakeLists.txt |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eb6be77..a857d44 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,7 +14,7 @@
 set(QMSETUP_DEFINITION_SCOPE DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 set(QMSETUP_DEFINITION_NUMERICAL on)
 
-qm_add_definition(QWINDOWKIT_TEST_CONFIG true)
+qm_add_definition(QWINDOWKIT_FORCE_QT_WINDOW_CONTEXT CONDITION QWINDOWKIT_FORCE_QT_WINDOW_CONTEXT)
 
 qm_generate_config(${QWINDOWKIT_BUILD_INCLUDE_DIR}/QWKCore/qwkconfig.h)
 
@@ -27,7 +27,7 @@
 # ----------------------------------
 # CMake API
 # ----------------------------------
-function(qwk_add_library _target)
+macro(qwk_add_library _target)
     set(options AUTOGEN NO_SYNC_INCLUDE NO_WIN_RC)
     set(oneValueArgs SYNC_INCLUDE_PREFIX PREFIX)
     set(multiValueArgs SYNC_INCLUDE_OPTIONS)
@@ -69,6 +69,7 @@
 
     # Add include directories
     target_include_directories(${_target} PRIVATE ${QWINDOWKIT_BUILD_INCLUDE_DIR})
+    target_include_directories(${_target} PRIVATE .)
 
     # Library name
     if(${_target} MATCHES "^QWK(.+)")
@@ -114,16 +115,12 @@
             "$<BUILD_INTERFACE:${QWINDOWKIT_GENERATED_INCLUDE_DIR}>"
         )
     endif()
-endfunction()
+endmacro()
 
 # ----------------------------------
 # Main Project
 # ----------------------------------
 add_subdirectory(core)
-
-if(QWINDOWKIT_BUILD_STYLE_SUPPORT)
-    add_subdirectory(stylesupport)
-endif()
 
 if(QWINDOWKIT_BUILD_WIDGETS)
     add_subdirectory(widgets)
@@ -131,6 +128,10 @@
 
 if(QWINDOWKIT_BUILD_QUICK)
     add_subdirectory(quick)
+endif()
+
+if(QWINDOWKIT_BUILD_STYLESUPPORT)
+    add_subdirectory(stylesupport)
 endif()
 
 # ----------------------------------
@@ -207,7 +208,5 @@
     )
 
     # Install shared files
-    install(DIRECTORY ../share/
-        DESTINATION share/${QWINDOWKIT_INSTALL_NAME}
-    )
+    include("../share/install.cmake")
 endif()
\ No newline at end of file

--
Gitblit v1.9.1