From d2ab98dec7375c9a3c1c2c4b3c2018258ac92feb Mon Sep 17 00:00:00 2001 From: deepin-ci-robot Date: Tue, 6 Jan 2026 03:11:34 +0000 Subject: [PATCH] sync: from linuxdeepin/qt5platform-plugins Synchronize source files from linuxdeepin/qt5platform-plugins. Source-pull-request: https://github.com/linuxdeepin/qt5platform-plugins/pull/316 --- CMakeLists.txt | 28 +++++++++++++++------------- tests/CMakeLists.txt | 9 +++++++-- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ed9d3d..a338b3b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,12 +4,11 @@ cmake_minimum_required(VERSION 3.13) -file(READ "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" DTK_FILE_VERSION) -string(STRIP "${DTK_FILE_VERSION}" DTK_FILE_VERSION) -set(DTK_VERSION "${DTK_FILE_VERSION}" CACHE STRING "define project version") +file(READ "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" FILE_VERSION) +string(STRIP "${FILE_VERSION}" FILE_VERSION) project(qt5platform-plugins - VERSION ${DTK_VERSION} + VERSION ${FILE_VERSION} DESCRIPTION "DTK platform plugin module" HOMEPAGE_URL "https://github.com/linuxdeepin/qt5platform-plugins" LANGUAGES CXX C @@ -22,15 +21,19 @@ endif () include(GNUInstallDirs) include(CMakePackageConfigHelpers) -if("${PROJECT_VERSION_MAJOR}" STREQUAL "5") - set(QT_VERSION_MAJOR "5") -elseif("${PROJECT_VERSION_MAJOR}" STREQUAL "6") - set(QT_VERSION_MAJOR "6") - set(DTK_VERSION_MAJOR "6") +option(DTK5 "Build DTK5." ON) +if(DTK5) + set(DTK_VERSION_MAJOR "5") else() - message(SEND_ERROR "not support Prject Version ${PROJECT_VERSION}.") + set(DTK_VERSION_MAJOR "6") endif() -message(${PROJECT_VERSION_MAJOR}) + +set(DTK_VERSION_MINOR ${PROJECT_VERSION_MINOR}) +set(DTK_VERSION_PATCH ${PROJECT_VERSION_PATCH}) +set(DTK_VERSION "${DTK_VERSION_MAJOR}.${DTK_VERSION_MINOR}.${DTK_VERSION_PATCH}") +set(QT_VERSION_MAJOR ${DTK_VERSION_MAJOR}) + +message(STATUS "Building DTK${DTK_VERSION_MAJOR} (Qt${QT_VERSION_MAJOR}) version: ${DTK_VERSION}") set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) @@ -48,11 +51,10 @@ endif () set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/plugins/platforms) add_subdirectory(xcb) -if("${PROJECT_VERSION_MAJOR}" STREQUAL "5") +if(DTK5) add_subdirectory(wayland) endif() if(BUILD_TESTING) enable_testing() add_subdirectory(tests) endif() -message(${PROJECT_VERSION_MAJOR}) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 6307176..e6915f3 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -26,8 +26,11 @@ include(${CMAKE_SOURCE_DIR}/xcb/linux.cmake) add_definitions(-DPLUGIN_OUTPUT_PATH=\"${LIBRARY_OUTPUT_PATH}/..\") -target_compile_options(${PROJECT_NAME} PRIVATE -fno-access-control -fsanitize=address) -target_link_options(${PROJECT_NAME} PRIVATE -fsanitize=address) +target_compile_options(${PROJECT_NAME} PRIVATE -fno-access-control) +if (CMAKE_BUILD_TYPE STREQUAL "Debug") + target_compile_options(${PROJECT_NAME} PRIVATE -fsanitize=address) + target_link_options(${PROJECT_NAME} PRIVATE -fsanitize=address) +endif () if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") target_compile_options(${PROJECT_NAME} PRIVATE -fprofile-instr-generate -ftest-coverage) endif() @@ -68,3 +71,5 @@ if(${QT_VERSION_MAJOR} STREQUAL "5") else() target_link_libraries(${PROJECT_NAME} PRIVATE Qt6::OpenGL Qt6::OpenGLPrivate Qt6::XcbQpaPrivate) endif() + +add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME})