From a81e09bcd3dfe9f7e44db60f9feb02284155aa6b Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周四, 14 12月 2023 14:46:43 +0800
Subject: [PATCH] minor tweaks

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3dd7697..4c6bd44 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,13 +5,16 @@
 set(QWINDOWKIT_GENERATED_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/../include)
 set(QWINDOWKIT_BUILD_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/../etc/include)
 
+set(QWINDOWKIT_ENABLED_TARGETS)
+set(QWINDOWKIT_ENABLED_SUBDIRECTORIES)
+
 # ----------------------------------
 # Configurations
 # ----------------------------------
 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)
 
@@ -24,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)
@@ -66,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(.+)")
@@ -111,7 +115,7 @@
             "$<BUILD_INTERFACE:${QWINDOWKIT_GENERATED_INCLUDE_DIR}>"
         )
     endif()
-endfunction()
+endmacro()
 
 # ----------------------------------
 # Main Project
@@ -144,21 +148,20 @@
         set(_install_options INSTALL_DIR share/doc/${QWINDOWKIT_INSTALL_NAME})
     endif()
 
-    set(_doc_targets)
-    qm_collect_targets(_doc_targets SHARED STATIC)
+    set(_doc_targets ${QWINDOWKIT_ENABLED_TARGETS})
 
     set(QWINDOWKIT_DOXYGEN_TAGFILE
         ${CMAKE_BUILD_SHARE_DIR}/doc/${QWINDOWKIT_INSTALL_NAME}/${QWINDOWKIT_INSTALL_NAME}_tagfile.xml
-        CACHE FILEPATH "QWINDOWKIT doxygen tag file path" FORCE
+        CACHE FILEPATH "QWindowKit doxygen tag file path" FORCE
     )
 
     qm_import(Doxygen)
-    qm_setup_doxygen(QWINDOWKIT_RunDoxygen
-        NAME "QWINDOWKIT"
+    qm_setup_doxygen(QWindowKit_RunDoxygen
+        NAME "QWindowKit"
         DESCRIPTION "${QWINDOWKIT_PROJECT_DESCRIPTION}"
         MDFILE ../README.md
         OUTPUT_DIR ${CMAKE_BUILD_SHARE_DIR}/doc/${QWINDOWKIT_INSTALL_NAME}
-        INPUT QWINDOWKIT
+        INPUT ${QWINDOWKIT_ENABLED_SUBDIRECTORIES}
         TARGETS ${_doc_targets}
         DEPENDS ${_doc_targets}
         NO_EXPAND_MACROS Q_OBJECT Q_GADGET Q_DECLARE_TR_FUNCTIONS

--
Gitblit v1.9.1