From 3e942c3dc8955be577079fbc028ce216e1c594b2 Mon Sep 17 00:00:00 2001
From: SineStriker <55847490+SineStriker@users.noreply.github.com>
Date: 周二, 11 2月 2025 19:07:53 +0800
Subject: [PATCH] Fix numerous bugs (#162)
---
src/CMakeLists.txt | 40 ++++++++++------------------------------
1 files changed, 10 insertions(+), 30 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 760c5c5..510c161 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,9 @@
qm_import(Preprocess)
+string(TIMESTAMP _current_year "%Y")
+
set(QWINDOWKIT_PROJECT_DESCRIPTION "Cross-platform window customization framework")
-set(QWINDOWKIT_PROJECT_COPYRIGHT "Copyright 2023 Stdware Collections")
+set(QWINDOWKIT_PROJECT_COPYRIGHT "Copyright 2023-${_current_year} Stdware Collections")
set(QWINDOWKIT_GENERATED_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/../include)
set(QWINDOWKIT_BUILD_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/../etc/include)
@@ -179,36 +181,14 @@
# 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