From ef7c04cd9ac06b64c516db47bda6f4d9c12db3b9 Mon Sep 17 00:00:00 2001 From: Dylan Liu <312902918@qq.com> Date: ćšć, 30 5æ 2024 19:45:07 +0800 Subject: [PATCH] quickwindowagent: Remove const for HitTestVisible API. --- src/CMakeLists.txt | 54 +++++++++++++++++------------------------------------- 1 files changed, 17 insertions(+), 37 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 616d783..6279fb5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,7 +14,15 @@ 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_BORDERS + CONDITION QWINDOWKIT_ENABLE_WINDOWS_SYSTEM_BORDERS +) qm_generate_config(${QWINDOWKIT_BUILD_INCLUDE_DIR}/QWKCore/qwkconfig.h) @@ -122,10 +130,6 @@ # ---------------------------------- add_subdirectory(core) -if(QWINDOWKIT_BUILD_STYLE_SUPPORT) - add_subdirectory(stylesupport) -endif() - if(QWINDOWKIT_BUILD_WIDGETS) add_subdirectory(widgets) endif() @@ -175,40 +179,16 @@ # 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 - install(DIRECTORY ../share/ - DESTINATION share/${QWINDOWKIT_INSTALL_NAME} - ) + include("../share/install.cmake") endif() \ No newline at end of file -- Gitblit v1.9.1