From cc65c4da6ad762e8648b2ab6a801e07c50922d3d Mon Sep 17 00:00:00 2001 From: Zhao Yuhang <2546789017@qq.com> Date: 周二, 04 2月 2025 21:58:21 +0800 Subject: [PATCH] fix compilation error --- src/CMakeLists.txt | 39 ++++++++++----------------------------- 1 files changed, 10 insertions(+), 29 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d847a76..6279fb5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,6 +17,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 ) @@ -176,36 +179,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