From 6b5317834bd9ed85589ebf9960e1eb7af4b9096e Mon Sep 17 00:00:00 2001 From: deepin-ci-robot Date: Tue, 6 Jan 2026 05:17:14 +0000 Subject: [PATCH] sync: from linuxdeepin/dtkdeclarative Synchronize source files from linuxdeepin/dtkdeclarative. Source-pull-request: https://github.com/linuxdeepin/dtkdeclarative/pull/556 --- CMakeLists.txt | 73 +++++++++---------- chameleon/CMakeLists.txt | 8 +- docs/CMakeLists.txt | 4 +- examples/exhibition/CMakeLists.txt | 19 +++-- examples/qml-inspect/CMakeLists.txt | 6 +- misc/DtkDeclarativeConfig.cmake.in | 16 ++-- misc/dtkdeclarative.pc.in | 10 +-- misc/qt_lib_dtkdeclarative.pri.in | 12 +-- qmlplugin/targets.cmake | 8 +- qt6/src/CMakeLists.txt | 10 +-- src/CMakeLists.txt | 8 +- src/src.cmake | 11 +-- src/targets.cmake | 12 +-- tests/CMakeLists.txt | 6 +- .../maincomponentplugin/CMakeLists.txt | 5 +- .../preloadplugin/CMakeLists.txt | 5 +- 16 files changed, 103 insertions(+), 110 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 74ce0cdf..7140cb51 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,36 +1,32 @@ cmake_minimum_required(VERSION 3.10) -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(DtkDeclarative - VERSION "${DTK_VERSION}" + VERSION ${FILE_VERSION} DESCRIPTION "DTK Declarative module" HOMEPAGE_URL "https://github.com/linuxdeepin/dtkdeclarative" LANGUAGES CXX ) -if (${PROJECT_VERSION_MAJOR} STREQUAL "5") - set(QT_DEFAULT_MAJOR_VERSION "5") - set(QT_VERSION_MAJOR "5") - set(EnableQt5 on) - set(EnableDtk5 on) - set(EnableQt6 off) - set(EnableDtk6 off) -elseif(${PROJECT_VERSION_MAJOR} STREQUAL "6") - set(QT_DEFAULT_MAJOR_VERSION "6") - set(QT_VERSION_MAJOR "6") - set(DTK_VERSION_MAJOR "6") - set(EnableQt5 off) - set(EnableDtk5 off) - set(EnableQt6 on) - set(EnableDtk6 on) +option(DTK5 "Build DTK5." ON) +if(DTK5) + set(DTK_VERSION_MAJOR "5") + set(DTK_NAME_SUFFIX "") else() - message(FATAL_ERROR "Only support DTK_VERSION is 5 or 6") + set(DTK_VERSION_MAJOR "6") + set(DTK_NAME_SUFFIX "6") endif() + +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}) + set(ENABLE_COV OFF CACHE BOOL "Generate coverage info") -set(LIB_NAME dtk${DTK_VERSION_MAJOR}declarative) +set(LIB_NAME dtk${DTK_NAME_SUFFIX}declarative) set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -50,9 +46,9 @@ include(DtkBuildConfig) set(BUILD_DOCS ON CACHE BOOL "Generate doxygen-based documentation") set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE STRING "Library install path") -set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/dtk${PROJECT_VERSION_MAJOR}/DDeclarative" CACHE STRING "Headers install path") +set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/dtk${DTK_VERSION_MAJOR}/DDeclarative" CACHE STRING "Headers install path") set(TEMPLATE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/qtcreator/templates/wizards/projects/qml${DTK_VERSION_MAJOR}-app-template" CACHE STRING "Directory to install QtCreator template") -set(CONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/Dtk${DTK_VERSION_MAJOR}Declarative" CACHE STRING "CMake config file install directory") +set(CONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/Dtk${DTK_NAME_SUFFIX}Declarative" CACHE STRING "CMake config file install directory") set(PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig" CACHE STRING "Directory to install pkg-config file") set(MKSPECS_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/qt${QT_VERSION_MAJOR}/mkspecs/modules" CACHE STRING "Qt pri module install directory") set(QML_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/qt${QT_VERSION_MAJOR}/qml" CACHE STRING "Qml plugin install directory") @@ -67,12 +63,11 @@ if (${QT_VERSION_MAJOR} STREQUAL "6") endif() endif() -if(EnableQt5) +if(DTK5) if(TARGET Qt::QuickControls2 AND TARGET Qt::QuickControls2Private) set(USE_QQuickStylePluginPrivate ON) endif() -endif() -if(EnableQt6) +else() if(TARGET Qt6::QuickControls2 AND TARGET Qt6::QuickControls2Private) set(USE_QQuickStylePluginPrivate ON) endif() @@ -88,7 +83,7 @@ else () set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Ofast") endif () -set(DDECLARATIVE_TRANSLATIONS_DIR "dtk${PROJECT_VERSION_MAJOR}/DDeclarative/translations" CACHE STRING "DDeclarative translations directory") +set(DDECLARATIVE_TRANSLATIONS_DIR "dtk${DTK_VERSION_MAJOR}/DDeclarative/translations" CACHE STRING "DDeclarative translations directory") set(DDECLARATIVE_TRANSLATIONS_PATH "share/${DDECLARATIVE_TRANSLATIONS_DIR}") set(TRANSLATIONS_INSTALL_PATH "${DDECLARATIVE_TRANSLATIONS_PATH}") @@ -98,11 +93,10 @@ set(PLUGIN_NAME dtkdeclarativeplugin) set(STYLE_PLUGIN_NAME qtquickcontrolschameleonstyleplugin) set(PLUGIN_OUTPUT_DIR ${PROJECT_BINARY_DIR}/plugins) -if(EnableQt5) +if(DTK5) add_subdirectory(src) add_subdirectory(qmlplugin) -endif() -if(EnableQt6) +else() add_subdirectory(qt6) endif() add_subdirectory(chameleon) @@ -113,16 +107,17 @@ if(BUILD_DOCS) endif() if(BUILD_TESTING) + enable_testing() add_subdirectory(tests) add_dependencies(unit-test ${PLUGIN_NAME} ${STYLE_PLUGIN_NAME}) - if(EnableQt6) + if(NOT DTK5) add_dependencies(unit-test dtkdeclarativeprivatesplugin dtkdeclarativesettingsplugin) endif() endif() # Install wizards template set(QML_TEMPLATE_QTVERSION_INDEX 0) -if(EnableQt5) +if(DTK5) set(QML_TEMPLATE_QTVERSION_INDEX 3) endif() configure_package_config_file( @@ -135,20 +130,20 @@ install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/misc/qml-app-template/" DESTINATION configure_package_config_file( "${CMAKE_CURRENT_LIST_DIR}/misc/DtkDeclarativeConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/Dtk${DTK_VERSION_MAJOR}DeclarativeConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/Dtk${DTK_NAME_SUFFIX}DeclarativeConfig.cmake" INSTALL_DESTINATION "${CONFIG_INSTALL_DIR}" ) write_basic_package_version_file( - "${CMAKE_CURRENT_BINARY_DIR}/Dtk${DTK_VERSION_MAJOR}DeclarativeConfigVersion.cmake" - VERSION ${VERSION} + "${CMAKE_CURRENT_BINARY_DIR}/Dtk${DTK_NAME_SUFFIX}DeclarativeConfigVersion.cmake" + VERSION ${DTK_VERSION} COMPATIBILITY SameMajorVersion ) # Install cmake config file -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/Dtk${DTK_VERSION_MAJOR}DeclarativeConfig.cmake" DESTINATION "${CONFIG_INSTALL_DIR}") -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/Dtk${DTK_VERSION_MAJOR}DeclarativeConfigVersion.cmake" DESTINATION "${CONFIG_INSTALL_DIR}") +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/Dtk${DTK_NAME_SUFFIX}DeclarativeConfig.cmake" DESTINATION "${CONFIG_INSTALL_DIR}") +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/Dtk${DTK_NAME_SUFFIX}DeclarativeConfigVersion.cmake" DESTINATION "${CONFIG_INSTALL_DIR}") # Install pkg-config file -configure_file("${PROJECT_SOURCE_DIR}/misc/dtkdeclarative.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/dtk${DTK_VERSION_MAJOR}declarative.pc" @ONLY) -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/dtk${DTK_VERSION_MAJOR}declarative.pc" DESTINATION "${PKGCONFIG_INSTALL_DIR}") +configure_file("${PROJECT_SOURCE_DIR}/misc/dtkdeclarative.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/dtk${DTK_NAME_SUFFIX}declarative.pc" @ONLY) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/dtk${DTK_NAME_SUFFIX}declarative.pc" DESTINATION "${PKGCONFIG_INSTALL_DIR}") # Install qmake module config file configure_file("${CMAKE_CURRENT_LIST_DIR}/misc/qt_lib_dtkdeclarative.pri.in" "${CMAKE_CURRENT_BINARY_DIR}/qt_lib_dtkdeclarative.pri" @ONLY) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt_lib_dtkdeclarative.pri" DESTINATION "${MKSPECS_INSTALL_DIR}") diff --git a/chameleon/CMakeLists.txt b/chameleon/CMakeLists.txt index e2ca6e1c..6a182b91 100644 --- a/chameleon/CMakeLists.txt +++ b/chameleon/CMakeLists.txt @@ -1,12 +1,12 @@ set(PLUGIN_NAME ${STYLE_PLUGIN_NAME}) -find_package(Dtk${DTK_VERSION_MAJOR}Gui REQUIRED) +find_package(Dtk${DTK_NAME_SUFFIX}Gui REQUIRED) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Qml Quick QuickControls2 REQUIRED ) -if(EnableQt5) +if(DTK5) find_package(Qt${QT_VERSION_MAJOR}QuickCompiler) endif() @@ -59,7 +59,7 @@ set(SRC_FILES qtquickcontrols2chameleonstyleplugin.h qtquickcontrols2chameleonstyleplugin.cpp ) -if(EnableQt5) +if(DTK5) file(GLOB _qml_files ${QML_FILES}) set(TARGETPATH "QtQuick/Controls.2/Chameleon") set(PLUGIN_INSTALL_DIR "${QML_INSTALL_DIR}/${TARGETPATH}") @@ -109,7 +109,7 @@ if(EnableQt5) ) endif() -if(EnableQt6) +if(NOT DTK5) qt_add_qml_module(${PLUGIN_NAME} URI "Chameleon" VERSION "1.0" diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 4bac5ed7..98b9978e 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -10,11 +10,11 @@ set (DOXYGEN_GENERATE_QHP "YES" CACHE STRING "Doxygen QHP output") set (DOXYGEN_FILTER_PATTERNS *.qml=doxyqml CACHE STRING "Extra filter patterns") set (DOXYGEN_FILE_PATTERNS *.cpp *.h *.zh_CN.md *.zh_CN.dox *.qml CACHE STRING "Doxygen File Patterns") set (DOXYGEN_EXTENSION_MAPPING qml=C++ CACHE STRING "Extra extension mapping") -set (DOXYGEN_PROJECT_NUMBER ${CMAKE_PROJECT_VERSION} CACHE STRING "") # Should be the same as this project is using. +set (DOXYGEN_PROJECT_NUMBER ${DTK_VERSION} CACHE STRING "") # Should be the same as this project is using. set (DOXYGEN_EXTRACT_STATIC YES) set (DOXYGEN_OUTPUT_LANGUAGE "Chinese" CACHE STRING "Doxygen Output Language") set (DOXYGEN_IMAGE_PATH ${CMAKE_CURRENT_LIST_DIR}/images/) -if (EnableQt5) +if (DTK5) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Help) else() find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS ToolsTools) diff --git a/examples/exhibition/CMakeLists.txt b/examples/exhibition/CMakeLists.txt index 778db851..1cd69e56 100644 --- a/examples/exhibition/CMakeLists.txt +++ b/examples/exhibition/CMakeLists.txt @@ -1,15 +1,14 @@ -set(BIN_NAME dtk-exhibition) +set(BIN_NAME dtk${DTK_NAME_SUFFIX}-exhibition) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Quick QuickControls2) -find_package(Dtk${DTK_VERSION_MAJOR}Core REQUIRED) -find_package(Dtk${DTK_VERSION_MAJOR}Gui REQUIRED) +find_package(Dtk${DTK_NAME_SUFFIX}Core REQUIRED) +find_package(Dtk${DTK_NAME_SUFFIX}Gui REQUIRED) set(CMAKE_EXE_LINKER_FLAGS "-z relro -z now -z noexecstack -pie -Wl,--as-needed") -if (EnableQt5) +if (DTK5) set(QML_RCS ${CMAKE_CURRENT_LIST_DIR}/qml.qrc) -endif() -if (EnableQt6) +else() set(QML_RCS ${CMAKE_CURRENT_LIST_DIR}/qml-qt6.qrc) endif() add_executable(${BIN_NAME} @@ -23,13 +22,13 @@ target_compile_options(${BIN_NAME} PRIVATE "-fpic") target_link_libraries(${BIN_NAME} PRIVATE Qt${QT_VERSION_MAJOR}::Quick Qt${QT_VERSION_MAJOR}::QuickControls2 - Dtk${DTK_VERSION_MAJOR}::Core - Dtk${DTK_VERSION_MAJOR}::Gui + Dtk${DTK_NAME_SUFFIX}::Core + Dtk${DTK_NAME_SUFFIX}::Gui ) set(EXAMPLE_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}") -if (EnableQt6) - set(EXAMPLE_INSTALL_DIR "${LIB_INSTALL_DIR}/dtk${PROJECT_VERSION_MAJOR}/DDeclarative") +if (NOT DTK5) + set(EXAMPLE_INSTALL_DIR "${LIB_INSTALL_DIR}/dtk${DTK_VERSION_MAJOR}/DDeclarative") endif() install(TARGETS ${BIN_NAME} DESTINATION ${EXAMPLE_INSTALL_DIR}) diff --git a/examples/qml-inspect/CMakeLists.txt b/examples/qml-inspect/CMakeLists.txt index 203dd1a2..a73d8507 100644 --- a/examples/qml-inspect/CMakeLists.txt +++ b/examples/qml-inspect/CMakeLists.txt @@ -1,8 +1,8 @@ set(BIN_NAME qml-inspect) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Quick QuickControls2) -find_package(Dtk${DTK_VERSION_MAJOR}Core REQUIRED) -find_package(Dtk${DTK_VERSION_MAJOR}Gui REQUIRED) +find_package(Dtk${DTK_NAME_SUFFIX}Core REQUIRED) +find_package(Dtk${DTK_NAME_SUFFIX}Gui REQUIRED) add_executable(${BIN_NAME} ${CMAKE_CURRENT_LIST_DIR}/main.cpp @@ -13,5 +13,5 @@ add_executable(${BIN_NAME} target_link_libraries(${BIN_NAME} PUBLIC Qt${QT_VERSION_MAJOR}::Quick Qt${QT_VERSION_MAJOR}::QuickControls2 - Dtk${DTK_VERSION_MAJOR}::Gui + Dtk${DTK_NAME_SUFFIX}::Gui ) diff --git a/misc/DtkDeclarativeConfig.cmake.in b/misc/DtkDeclarativeConfig.cmake.in index e8aea894..74c86dcf 100644 --- a/misc/DtkDeclarativeConfig.cmake.in +++ b/misc/DtkDeclarativeConfig.cmake.in @@ -1,17 +1,17 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) -find_dependency(Dtk@DTK_VERSION_MAJOR@Core) -find_dependency(Dtk@DTK_VERSION_MAJOR@Gui) +find_dependency(Dtk@DTK_NAME_SUFFIX@Core) +find_dependency(Dtk@DTK_NAME_SUFFIX@Gui) find_package(Qt@QT_VERSION_MAJOR@ COMPONENTS Qml Quick REQUIRED ) -include(${CMAKE_CURRENT_LIST_DIR}/Dtk@DTK_VERSION_MAJOR@DeclarativePropertiesTargets.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/Dtk@DTK_VERSION_MAJOR@DeclarativeTargets.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/Dtk@DTK_NAME_SUFFIX@DeclarativePropertiesTargets.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/Dtk@DTK_NAME_SUFFIX@DeclarativeTargets.cmake) set(DTK_QML_APP_PLUGIN_PATH @DTK_QML_APP_PLUGIN_PATH@) -get_target_property(DtkDeclarative_INCLUDE_DIRS Dtk@DTK_VERSION_MAJOR@::Declarative INTERFACE_INCLUDE_DIRECTORIES) -get_target_property(DtkDeclarative_LIBRARY_DIRS Dtk@DTK_VERSION_MAJOR@::Declarative INTERFACE_LINK_DIRECTORIES) +get_target_property(DtkDeclarative_INCLUDE_DIRS Dtk@DTK_NAME_SUFFIX@::Declarative INTERFACE_INCLUDE_DIRECTORIES) +get_target_property(DtkDeclarative_LIBRARY_DIRS Dtk@DTK_NAME_SUFFIX@::Declarative INTERFACE_LINK_DIRECTORIES) set(DTKDeclarative_INCLUDE_DIR ${DtkDeclarative_INCLUDE_DIRS}) -set(DtkDeclarative_LIBRARIES Dtk@DTK_VERSION_MAJOR@::Declarative) -check_required_components(Dtk@DTK_VERSION_MAJOR@Core) +set(DtkDeclarative_LIBRARIES Dtk@DTK_NAME_SUFFIX@::Declarative) +check_required_components(Dtk@DTK_NAME_SUFFIX@Core) diff --git a/misc/dtkdeclarative.pc.in b/misc/dtkdeclarative.pc.in index dc3827fa..857e9bac 100644 --- a/misc/dtkdeclarative.pc.in +++ b/misc/dtkdeclarative.pc.in @@ -1,11 +1,11 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} libdir=${prefix}/@LIB_INSTALL_DIR@ -includedir=${prefix}/@INCLUDE_INSTALL_DIR@ +includedir=${prefix}/include/dtk@DTK_VERSION_MAJOR@/DDeclarative -Name: DtkDeclarative +Name: Dtk@DTK_NAME_SUFFIX@Declarative Description: Deepin Tool Kit DtkDeclarative header files -Version: @CMAKE_PROJECT_VERSION@ -Libs: -L${libdir} -ldtk@DTK_VERSION_MAJOR@declarative +Version: @DTK_VERSION@ +Libs: -L${libdir} -ldtk@DTK_NAME_SUFFIX@declarative Cflags: -I${includedir} -Requires: dtk@DTK_VERSION_MAJOR@core dtk@DTK_VERSION_MAJOR@gui Qt@QT_VERSION_MAJOR@Core Qt@QT_VERSION_MAJOR@Gui Qt@QT_VERSION_MAJOR@DBus Qt@QT_VERSION_MAJOR@Xml Qt@QT_VERSION_MAJOR@Quick +Requires: dtk@DTK_NAME_SUFFIX@core dtk@DTK_NAME_SUFFIX@gui Qt@QT_VERSION_MAJOR@Core Qt@QT_VERSION_MAJOR@Gui Qt@QT_VERSION_MAJOR@DBus Qt@QT_VERSION_MAJOR@Xml Qt@QT_VERSION_MAJOR@Quick diff --git a/misc/qt_lib_dtkdeclarative.pri.in b/misc/qt_lib_dtkdeclarative.pri.in index 87978024..f6dce333 100644 --- a/misc/qt_lib_dtkdeclarative.pri.in +++ b/misc/qt_lib_dtkdeclarative.pri.in @@ -1,11 +1,11 @@ -QT.dtkdeclarative.VERSION = @CMAKE_PROJECT_VERSION@ -QT.dtkdeclarative.MAJOR_VERSION = @PROJECT_VERSION_MAJOR@ -QT.dtkdeclarative.MINOR_VERSION = @PROJECT_VERSION_MINOR@ -QT.dtkdeclarative.PATCH_VERSION = @PROJECT_VERSION_PATCH@ +QT.dtkdeclarative.VERSION = @DTK_VERSION@ +QT.dtkdeclarative.MAJOR_VERSION = @DTK_VERSION_MAJOR@ +QT.dtkdeclarative.MINOR_VERSION = @DTK_VERSION_MINOR@ +QT.dtkdeclarative.PATCH_VERSION = @DTK_VERSION_PATCH@ QT.dtkdeclarative.name = dtkdeclarative -QT.dtkdeclarative.module = dtk@DTK_VERSION_MAJOR@declarative +QT.dtkdeclarative.module = dtk@DTK_NAME_SUFFIX@declarative QT.dtkdeclarative.libs = @CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@ -QT.dtkdeclarative.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ +QT.dtkdeclarative.includes = @CMAKE_INSTALL_PREFIX@/include/dtk@DTK_VERSION_MAJOR@/DDeclarative QT.dtkdeclarative.frameworks = QT.dtkdeclarative.depends = core dbus xml gui dtkcore dtkgui quick quick_private QT.dtkdeclarative.module_config = v2 ltcg diff --git a/qmlplugin/targets.cmake b/qmlplugin/targets.cmake index 3b2bee28..b10ed7cb 100644 --- a/qmlplugin/targets.cmake +++ b/qmlplugin/targets.cmake @@ -1,6 +1,6 @@ find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Qml Quick) -find_package(Dtk${DTK_VERSION_MAJOR}Core REQUIRED) -find_package(Dtk${DTK_VERSION_MAJOR}Gui REQUIRED) +find_package(Dtk${DTK_NAME_SUFFIX}Core REQUIRED) +find_package(Dtk${DTK_NAME_SUFFIX}Gui REQUIRED) add_library(${PLUGIN_NAME}_interface INTERFACE) target_sources(${PLUGIN_NAME}_interface INTERFACE @@ -13,6 +13,6 @@ target_link_libraries(${PLUGIN_NAME}_interface INTERFACE Qt${QT_VERSION_MAJOR}::QmlPrivate Qt${QT_VERSION_MAJOR}::Quick Qt${QT_VERSION_MAJOR}::QuickPrivate - Dtk${DTK_VERSION_MAJOR}::Core - Dtk${DTK_VERSION_MAJOR}::Gui + Dtk${DTK_NAME_SUFFIX}::Core + Dtk${DTK_NAME_SUFFIX}::Gui ) diff --git a/qt6/src/CMakeLists.txt b/qt6/src/CMakeLists.txt index 63b82ca3..7fda45ee 100644 --- a/qt6/src/CMakeLists.txt +++ b/qt6/src/CMakeLists.txt @@ -1,6 +1,6 @@ include(${PROJECT_SOURCE_DIR}/src/targets.cmake) -find_package(Qt${QT_DEFAULT_MAJOR_VERSION}ShaderTools) +find_package(Qt${QT_VERSION_MAJOR}ShaderTools) include(${PROJECT_SOURCE_DIR}/qt6/src/qml.cmake) qt_add_qml_module(${LIB_NAME} @@ -32,8 +32,8 @@ qt_add_translations(${LIB_NAME} ) set_target_properties(${LIB_NAME} PROPERTIES - VERSION ${CMAKE_PROJECT_VERSION} - SOVERSION ${CMAKE_PROJECT_VERSION_MAJOR} + VERSION ${DTK_VERSION} + SOVERSION ${DTK_VERSION_MAJOR} EXPORT_NAME Declarative ) @@ -80,9 +80,9 @@ set_target_properties(${PLUGIN_NAME} PROPERTIES ) # Install library -install(TARGETS ${LIB_NAME} EXPORT Dtk${DTK_VERSION_MAJOR}DeclarativeTargets DESTINATION "${LIB_INSTALL_DIR}") +install(TARGETS ${LIB_NAME} EXPORT Dtk${DTK_NAME_SUFFIX}DeclarativeTargets DESTINATION "${LIB_INSTALL_DIR}") # Install export targets -install(EXPORT Dtk${DTK_VERSION_MAJOR}DeclarativeTargets NAMESPACE Dtk${DTK_VERSION_MAJOR}:: FILE Dtk${DTK_VERSION_MAJOR}DeclarativeTargets.cmake DESTINATION "${CONFIG_INSTALL_DIR}") +install(EXPORT Dtk${DTK_NAME_SUFFIX}DeclarativeTargets NAMESPACE Dtk${DTK_NAME_SUFFIX}:: FILE Dtk${DTK_NAME_SUFFIX}DeclarativeTargets.cmake DESTINATION "${CONFIG_INSTALL_DIR}") # Install translations install(FILES ${QM_FILES} DESTINATION "${TRANSLATIONS_INSTALL_PATH}") # Install plugin diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ce8cd5db..4a5e211b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -22,8 +22,8 @@ target_compile_definitions(${LIB_NAME} PRIVATE ) set_target_properties(${LIB_NAME} PROPERTIES - VERSION ${CMAKE_PROJECT_VERSION} - SOVERSION ${CMAKE_PROJECT_VERSION_MAJOR} + VERSION ${DTK_VERSION} + SOVERSION ${DTK_VERSION_MAJOR} EXPORT_NAME Declarative ) @@ -38,6 +38,6 @@ PRIVATE install(FILES ${QM_FILES} DESTINATION "${TRANSLATIONS_INSTALL_PATH}") # Install library -install(TARGETS ${LIB_NAME} EXPORT Dtk${DTK_VERSION_MAJOR}DeclarativeTargets DESTINATION "${LIB_INSTALL_DIR}") +install(TARGETS ${LIB_NAME} EXPORT Dtk${DTK_NAME_SUFFIX}DeclarativeTargets DESTINATION "${LIB_INSTALL_DIR}") # Install export targets -install(EXPORT Dtk${DTK_VERSION_MAJOR}DeclarativeTargets NAMESPACE Dtk:: FILE Dtk${DTK_VERSION_MAJOR}DeclarativeTargets.cmake DESTINATION "${CONFIG_INSTALL_DIR}") +install(EXPORT Dtk${DTK_NAME_SUFFIX}DeclarativeTargets NAMESPACE Dtk${DTK_NAME_SUFFIX}:: FILE Dtk${DTK_NAME_SUFFIX}DeclarativeTargets.cmake DESTINATION "${CONFIG_INSTALL_DIR}") diff --git a/src/src.cmake b/src/src.cmake index 588ce2d4..9d7b05ea 100644 --- a/src/src.cmake +++ b/src/src.cmake @@ -19,8 +19,9 @@ file(GLOB PUBLIC_HEADERS ${PROJECT_SOURCE_DIR}/src/dtkdeclarative_global.h ) + # exclusive to dtk5 -if (EnableDtk5) +if (DTK5) list(APPEND D_HEADERS ${PROJECT_SOURCE_DIR}/src/DPlatformThemeProxy ${PROJECT_SOURCE_DIR}/src/DQuickSystemPalette @@ -43,12 +44,12 @@ if (EnableDtk5) endif() # exclusive to dtk6 -if (EnableDtk6) +if (NOT DTK5) list(REMOVE_ITEM HEADERS - ${PROJECT_SOURCE_DIR}/src/dquicksystempalette.h - ${PROJECT_SOURCE_DIR}/src/private/dquicksystempalette_p.h + ${PROJECT_SOURCE_DIR}/src/dquicksystempalette.h + ${PROJECT_SOURCE_DIR}/src/private/dquicksystempalette_p.h ) list(REMOVE_ITEM SRCS - ${PROJECT_SOURCE_DIR}/src/dquicksystempalette.cpp + ${PROJECT_SOURCE_DIR}/src/dquicksystempalette.cpp ) endif() diff --git a/src/targets.cmake b/src/targets.cmake index 3b32bd02..9f42cea7 100644 --- a/src/targets.cmake +++ b/src/targets.cmake @@ -16,8 +16,8 @@ if ("${QT_VERSION_MAJOR}" STREQUAL "6") endif() endif() -find_package(Dtk${DTK_VERSION_MAJOR}Core REQUIRED) -find_package(Dtk${DTK_VERSION_MAJOR}Gui REQUIRED) +find_package(Dtk${DTK_NAME_SUFFIX}Core REQUIRED) +find_package(Dtk${DTK_NAME_SUFFIX}Gui REQUIRED) find_package(PkgConfig REQUIRED) pkg_check_modules(GL REQUIRED IMPORTED_TARGET gl) @@ -53,8 +53,8 @@ endif() target_link_libraries(${LIB_NAME}_properties INTERFACE Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Quick - Dtk${DTK_VERSION_MAJOR}::Core - Dtk${DTK_VERSION_MAJOR}::Gui + Dtk${DTK_NAME_SUFFIX}::Core + Dtk${DTK_NAME_SUFFIX}::Gui $ $ $ @@ -83,5 +83,5 @@ list(APPEND PUBLIC_HEADERS ${CONFIG_PATH}) install(FILES ${PUBLIC_HEADERS} ${D_HEADERS} DESTINATION "${INCLUDE_INSTALL_DIR}") # Install ${LIB_NAME}_properties -install(TARGETS ${LIB_NAME}_properties EXPORT Dtk${DTK_VERSION_MAJOR}DeclarativeProperties DESTINATION "${LIB_INSTALL_DIR}") -install(EXPORT Dtk${DTK_VERSION_MAJOR}DeclarativeProperties NAMESPACE Dtk${DTK_VERSION_MAJOR}:: FILE Dtk${DTK_VERSION_MAJOR}DeclarativePropertiesTargets.cmake DESTINATION "${CONFIG_INSTALL_DIR}") +install(TARGETS ${LIB_NAME}_properties EXPORT Dtk${DTK_NAME_SUFFIX}DeclarativeProperties DESTINATION "${LIB_INSTALL_DIR}") +install(EXPORT Dtk${DTK_NAME_SUFFIX}DeclarativeProperties NAMESPACE Dtk${DTK_NAME_SUFFIX}:: FILE Dtk${DTK_NAME_SUFFIX}DeclarativePropertiesTargets.cmake DESTINATION "${CONFIG_INSTALL_DIR}") diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index c924ef5a..9b93675f 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,7 +1,7 @@ set(BIN_NAME unit-test) -find_package(Dtk${DTK_VERSION_MAJOR}Core REQUIRED) -find_package(Dtk${DTK_VERSION_MAJOR}Gui REQUIRED) +find_package(Dtk${DTK_NAME_SUFFIX}Core REQUIRED) +find_package(Dtk${DTK_NAME_SUFFIX}Gui REQUIRED) find_package(GTest REQUIRED) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Quick QuickControls2 Qml Test) @@ -39,7 +39,7 @@ file(GLOB TEST_SOURCES ut_dquickblitframebuffer.cpp ut_dtkdeclatative_qmls.cpp ) -if (EnableDtk5) +if (DTK5) list(APPEND TEST_SOURCES ut_dplatformthemeproxy.cpp ) diff --git a/tests/apploaderplugindump/maincomponentplugin/CMakeLists.txt b/tests/apploaderplugindump/maincomponentplugin/CMakeLists.txt index c0f736bc..0844edaa 100644 --- a/tests/apploaderplugindump/maincomponentplugin/CMakeLists.txt +++ b/tests/apploaderplugindump/maincomponentplugin/CMakeLists.txt @@ -1,7 +1,6 @@ -if(EnableQt5) +if(DTK5) qtquick_compiler_add_resources(MAINCOMPONENT_RCC_SOURCES maincomponent.qrc) -endif() -if(EnableQt6) +else() qt_add_resources(MAINCOMPONENT_RCC_SOURCES maincomponent.qrc) endif() diff --git a/tests/apploaderplugindump/preloadplugin/CMakeLists.txt b/tests/apploaderplugindump/preloadplugin/CMakeLists.txt index 9865ce96..74c582f0 100644 --- a/tests/apploaderplugindump/preloadplugin/CMakeLists.txt +++ b/tests/apploaderplugindump/preloadplugin/CMakeLists.txt @@ -1,7 +1,6 @@ -if(EnableQt5) +if(DTK5) qtquick_compiler_add_resources(PRELOAD_RCC_SOURCES preload.qrc) -endif() -if(EnableQt6) +else() qt_add_resources(PRELOAD_RCC_SOURCES preload.qrc) endif()