From 54623b054721d42db721d0ba7429b6f8878fc1a5 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 26 12月 2023 02:44:18 +0800
Subject: [PATCH] minor tweaks
---
src/CMakeLists.txt | 64 ++++++++------------------------
1 files changed, 16 insertions(+), 48 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3dd7697..97a7669 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,13 +5,24 @@
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_ENABLE_QT_WINDOW_CONTEXT
+ CONDITION QWINDOWKIT_ENABLE_QT_WINDOW_CONTEXT
+)
+qm_add_definition(QWINDOWKIT_ENABLE_STYLE_AGENT
+ CONDITION QWINDOWKIT_ENABLE_STYLE_AGENT
+)
+qm_add_definition(QWINDOWKIT_ENABLE_WINDOWS_SYSTEM_BORDER
+ CONDITION QWINDOWKIT_ENABLE_WINDOWS_SYSTEM_BORDER
+)
qm_generate_config(${QWINDOWKIT_BUILD_INCLUDE_DIR}/QWKCore/qwkconfig.h)
@@ -24,7 +35,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 +77,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,16 +123,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)
@@ -128,44 +136,6 @@
if(QWINDOWKIT_BUILD_QUICK)
add_subdirectory(quick)
-endif()
-
-# ----------------------------------
-# Documentation
-# ----------------------------------
-if(QWINDOWKIT_BUILD_DOCUMENTATIONS)
- if(NOT DOXYGEN_EXECUTABLE)
- find_package(Doxygen REQUIRED)
- endif()
-
- set(_install_options)
-
- if(QWINDOWKIT_INSTALL)
- set(_install_options INSTALL_DIR share/doc/${QWINDOWKIT_INSTALL_NAME})
- endif()
-
- set(_doc_targets)
- qm_collect_targets(_doc_targets SHARED STATIC)
-
- 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
- )
-
- qm_import(Doxygen)
- 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
- TARGETS ${_doc_targets}
- DEPENDS ${_doc_targets}
- NO_EXPAND_MACROS Q_OBJECT Q_GADGET Q_DECLARE_TR_FUNCTIONS
- COMPILE_DEFINITIONS Q_SIGNALS=Q_SIGNALS Q_SLOTS=Q_SLOTS
- GENERATE_TAGFILE "${QWINDOWKIT_DOXYGEN_TAGFILE}"
- ${_install_options}
- )
endif()
# ----------------------------------
@@ -205,7 +175,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