From 9dcea027f16c4ce5852da3dfc8aca284c582bd7d Mon Sep 17 00:00:00 2001
From: sola.lu <sola.lu.greentest.com.cn>
Date: 周五, 06 6月 2025 18:19:18 +0800
Subject: [PATCH] 1.注释掉custom margin，解决程序放大后，遮盖窗口底部内容的问题。
---
src/CMakeLists.txt | 82 ++++++++++++++++++++++++----------------
1 files changed, 49 insertions(+), 33 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 267b05a..815e4da 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,5 @@
qm_import(Preprocess)
-set(QWINDOWKIT_PROJECT_DESCRIPTION "Cross-platform window customization framework")
-set(QWINDOWKIT_PROJECT_COPYRIGHT "Copyright 2023 Stdware Collections")
set(QWINDOWKIT_GENERATED_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/../include)
set(QWINDOWKIT_BUILD_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/../etc/include)
@@ -16,6 +14,9 @@
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_BORDERS
CONDITION QWINDOWKIT_ENABLE_WINDOWS_SYSTEM_BORDERS
@@ -55,8 +56,8 @@
if(WIN32 AND NOT FUNC_NO_WIN_RC AND(${_type} STREQUAL "SHARED"))
qm_add_win_rc(${_target}
NAME ${QWINDOWKIT_INSTALL_NAME}
- DESCRIPTION ${QWINDOWKIT_PROJECT_DESCRIPTION}
- COPYRIGHT ${QWINDOWKIT_PROJECT_COPYRIGHT}
+ DESCRIPTION ${QWINDOWKIT_DESCRIPTION}
+ COPYRIGHT ${QACTIONKIT_COPYRIGHT}
)
endif()
@@ -136,39 +137,54 @@
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 ${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
+ )
+
+ qm_import(Doxygen)
+ qm_setup_doxygen(QWindowKit_RunDoxygen
+ NAME "QWindowKit"
+ DESCRIPTION "${QWINDOWKIT_DESCRIPTION}"
+ MDFILE ../README.md
+ OUTPUT_DIR ${CMAKE_BUILD_SHARE_DIR}/doc/${QWINDOWKIT_INSTALL_NAME}
+ INPUT ${QWINDOWKIT_ENABLED_SUBDIRECTORIES}
+ 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()
+
+# ----------------------------------
# Install
# ----------------------------------
if(QWINDOWKIT_INSTALL)
- # Add install target
- set(_install_dir ${CMAKE_INSTALL_LIBDIR}/cmake/${QWINDOWKIT_INSTALL_NAME})
-
- # Add version file
- write_basic_package_version_file(
- "${CMAKE_CURRENT_BINARY_DIR}/${QWINDOWKIT_INSTALL_NAME}ConfigVersion.cmake"
- VERSION ${PROJECT_VERSION}
- COMPATIBILITY AnyNewerVersion
- )
-
- # Add configuration file
- configure_package_config_file(
- ${CMAKE_CURRENT_LIST_DIR}/${QWINDOWKIT_INSTALL_NAME}Config.cmake.in
- "${CMAKE_CURRENT_BINARY_DIR}/${QWINDOWKIT_INSTALL_NAME}Config.cmake"
- INSTALL_DESTINATION ${_install_dir}
- NO_CHECK_REQUIRED_COMPONENTS_MACRO
- )
-
- # Install cmake files
- install(FILES
- "${CMAKE_CURRENT_BINARY_DIR}/${QWINDOWKIT_INSTALL_NAME}Config.cmake"
- "${CMAKE_CURRENT_BINARY_DIR}/${QWINDOWKIT_INSTALL_NAME}ConfigVersion.cmake"
- DESTINATION ${_install_dir}
- )
-
- # Install cmake targets files
- install(EXPORT ${QWINDOWKIT_INSTALL_NAME}Targets
- FILE "${QWINDOWKIT_INSTALL_NAME}Targets.cmake"
+ qm_basic_install(
+ NAME ${QWINDOWKIT_INSTALL_NAME}
+ VERSION ${QWINDOWKIT_VERSION}
+ INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/${QWINDOWKIT_INSTALL_NAME}
+ CONFIG_TEMPLATE "${QWINDOWKIT_INSTALL_NAME}Config.cmake.in"
NAMESPACE ${QWINDOWKIT_INSTALL_NAME}::
- DESTINATION ${_install_dir}
+ EXPORT ${QWINDOWKIT_INSTALL_NAME}Targets
+ WRITE_CONFIG_OPTIONS NO_CHECK_REQUIRED_COMPONENTS_MACRO
)
# Install shared files
--
Gitblit v1.9.1