Skip to content

Commit feef8af

Browse files
deepin-ci-robotdeepin-ci-robot
committed
sync: from linuxdeepin/dtkdeclarative
Synchronize source files from linuxdeepin/dtkdeclarative. Source-pull-request: linuxdeepin/dtkdeclarative#555
1 parent b589d3c commit feef8af

16 files changed

Lines changed: 103 additions & 110 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 34 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,32 @@
11
cmake_minimum_required(VERSION 3.10)
22

3-
file(READ "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" DTK_FILE_VERSION)
4-
string(STRIP "${DTK_FILE_VERSION}" DTK_FILE_VERSION)
5-
set(DTK_VERSION "${DTK_FILE_VERSION}" CACHE STRING "Define project version")
3+
file(READ "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" FILE_VERSION)
4+
string(STRIP "${FILE_VERSION}" FILE_VERSION)
5+
66
project(DtkDeclarative
7-
VERSION "${DTK_VERSION}"
7+
VERSION ${FILE_VERSION}
88
DESCRIPTION "DTK Declarative module"
99
HOMEPAGE_URL "https://github.com/linuxdeepin/dtkdeclarative"
1010
LANGUAGES CXX
1111
)
1212

13-
if (${PROJECT_VERSION_MAJOR} STREQUAL "5")
14-
set(QT_DEFAULT_MAJOR_VERSION "5")
15-
set(QT_VERSION_MAJOR "5")
16-
set(EnableQt5 on)
17-
set(EnableDtk5 on)
18-
set(EnableQt6 off)
19-
set(EnableDtk6 off)
20-
elseif(${PROJECT_VERSION_MAJOR} STREQUAL "6")
21-
set(QT_DEFAULT_MAJOR_VERSION "6")
22-
set(QT_VERSION_MAJOR "6")
23-
set(DTK_VERSION_MAJOR "6")
24-
set(EnableQt5 off)
25-
set(EnableDtk5 off)
26-
set(EnableQt6 on)
27-
set(EnableDtk6 on)
13+
option(DTK5 "Build DTK5." ON)
14+
if(DTK5)
15+
set(DTK_VERSION_MAJOR "5")
16+
set(DTK_NAME_SUFFIX "")
2817
else()
29-
message(FATAL_ERROR "Only support DTK_VERSION is 5 or 6")
18+
set(DTK_VERSION_MAJOR "6")
19+
set(DTK_NAME_SUFFIX "6")
3020
endif()
3121

22+
23+
set(DTK_VERSION_MINOR ${PROJECT_VERSION_MINOR})
24+
set(DTK_VERSION_PATCH ${PROJECT_VERSION_PATCH})
25+
set(DTK_VERSION "${DTK_VERSION_MAJOR}.${DTK_VERSION_MINOR}.${DTK_VERSION_PATCH}")
26+
set(QT_VERSION_MAJOR ${DTK_VERSION_MAJOR})
27+
3228
set(ENABLE_COV OFF CACHE BOOL "Generate coverage info")
33-
set(LIB_NAME dtk${DTK_VERSION_MAJOR}declarative)
29+
set(LIB_NAME dtk${DTK_NAME_SUFFIX}declarative)
3430

3531
set(CMAKE_CXX_STANDARD 11)
3632
set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -50,9 +46,9 @@ include(DtkBuildConfig)
5046
set(BUILD_DOCS ON CACHE BOOL "Generate doxygen-based documentation")
5147

5248
set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE STRING "Library install path")
53-
set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/dtk${PROJECT_VERSION_MAJOR}/DDeclarative" CACHE STRING "Headers install path")
49+
set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/dtk${DTK_VERSION_MAJOR}/DDeclarative" CACHE STRING "Headers install path")
5450
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")
55-
set(CONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/Dtk${DTK_VERSION_MAJOR}Declarative" CACHE STRING "CMake config file install directory")
51+
set(CONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/Dtk${DTK_NAME_SUFFIX}Declarative" CACHE STRING "CMake config file install directory")
5652
set(PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig" CACHE STRING "Directory to install pkg-config file")
5753
set(MKSPECS_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/qt${QT_VERSION_MAJOR}/mkspecs/modules" CACHE STRING "Qt pri module install directory")
5854
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")
6763
endif()
6864
endif()
6965

70-
if(EnableQt5)
66+
if(DTK5)
7167
if(TARGET Qt::QuickControls2 AND TARGET Qt::QuickControls2Private)
7268
set(USE_QQuickStylePluginPrivate ON)
7369
endif()
74-
endif()
75-
if(EnableQt6)
70+
else()
7671
if(TARGET Qt6::QuickControls2 AND TARGET Qt6::QuickControls2Private)
7772
set(USE_QQuickStylePluginPrivate ON)
7873
endif()
@@ -88,7 +83,7 @@ else ()
8883
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Ofast")
8984
endif ()
9085

91-
set(DDECLARATIVE_TRANSLATIONS_DIR "dtk${PROJECT_VERSION_MAJOR}/DDeclarative/translations" CACHE STRING "DDeclarative translations directory")
86+
set(DDECLARATIVE_TRANSLATIONS_DIR "dtk${DTK_VERSION_MAJOR}/DDeclarative/translations" CACHE STRING "DDeclarative translations directory")
9287
set(DDECLARATIVE_TRANSLATIONS_PATH "share/${DDECLARATIVE_TRANSLATIONS_DIR}")
9388
set(TRANSLATIONS_INSTALL_PATH "${DDECLARATIVE_TRANSLATIONS_PATH}")
9489

@@ -98,11 +93,10 @@ set(PLUGIN_NAME dtkdeclarativeplugin)
9893
set(STYLE_PLUGIN_NAME qtquickcontrolschameleonstyleplugin)
9994
set(PLUGIN_OUTPUT_DIR ${PROJECT_BINARY_DIR}/plugins)
10095

101-
if(EnableQt5)
96+
if(DTK5)
10297
add_subdirectory(src)
10398
add_subdirectory(qmlplugin)
104-
endif()
105-
if(EnableQt6)
99+
else()
106100
add_subdirectory(qt6)
107101
endif()
108102
add_subdirectory(chameleon)
@@ -113,16 +107,17 @@ if(BUILD_DOCS)
113107
endif()
114108

115109
if(BUILD_TESTING)
110+
enable_testing()
116111
add_subdirectory(tests)
117112
add_dependencies(unit-test ${PLUGIN_NAME} ${STYLE_PLUGIN_NAME})
118-
if(EnableQt6)
113+
if(NOT DTK5)
119114
add_dependencies(unit-test dtkdeclarativeprivatesplugin dtkdeclarativesettingsplugin)
120115
endif()
121116
endif()
122117

123118
# Install wizards template
124119
set(QML_TEMPLATE_QTVERSION_INDEX 0)
125-
if(EnableQt5)
120+
if(DTK5)
126121
set(QML_TEMPLATE_QTVERSION_INDEX 3)
127122
endif()
128123
configure_package_config_file(
@@ -135,20 +130,20 @@ install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/misc/qml-app-template/" DESTINATION
135130

136131
configure_package_config_file(
137132
"${CMAKE_CURRENT_LIST_DIR}/misc/DtkDeclarativeConfig.cmake.in"
138-
"${CMAKE_CURRENT_BINARY_DIR}/Dtk${DTK_VERSION_MAJOR}DeclarativeConfig.cmake"
133+
"${CMAKE_CURRENT_BINARY_DIR}/Dtk${DTK_NAME_SUFFIX}DeclarativeConfig.cmake"
139134
INSTALL_DESTINATION "${CONFIG_INSTALL_DIR}"
140135
)
141136
write_basic_package_version_file(
142-
"${CMAKE_CURRENT_BINARY_DIR}/Dtk${DTK_VERSION_MAJOR}DeclarativeConfigVersion.cmake"
143-
VERSION ${VERSION}
137+
"${CMAKE_CURRENT_BINARY_DIR}/Dtk${DTK_NAME_SUFFIX}DeclarativeConfigVersion.cmake"
138+
VERSION ${DTK_VERSION}
144139
COMPATIBILITY SameMajorVersion
145140
)
146141
# Install cmake config file
147-
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/Dtk${DTK_VERSION_MAJOR}DeclarativeConfig.cmake" DESTINATION "${CONFIG_INSTALL_DIR}")
148-
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/Dtk${DTK_VERSION_MAJOR}DeclarativeConfigVersion.cmake" DESTINATION "${CONFIG_INSTALL_DIR}")
142+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/Dtk${DTK_NAME_SUFFIX}DeclarativeConfig.cmake" DESTINATION "${CONFIG_INSTALL_DIR}")
143+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/Dtk${DTK_NAME_SUFFIX}DeclarativeConfigVersion.cmake" DESTINATION "${CONFIG_INSTALL_DIR}")
149144
# Install pkg-config file
150-
configure_file("${PROJECT_SOURCE_DIR}/misc/dtkdeclarative.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/dtk${DTK_VERSION_MAJOR}declarative.pc" @ONLY)
151-
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/dtk${DTK_VERSION_MAJOR}declarative.pc" DESTINATION "${PKGCONFIG_INSTALL_DIR}")
145+
configure_file("${PROJECT_SOURCE_DIR}/misc/dtkdeclarative.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/dtk${DTK_NAME_SUFFIX}declarative.pc" @ONLY)
146+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/dtk${DTK_NAME_SUFFIX}declarative.pc" DESTINATION "${PKGCONFIG_INSTALL_DIR}")
152147
# Install qmake module config file
153148
configure_file("${CMAKE_CURRENT_LIST_DIR}/misc/qt_lib_dtkdeclarative.pri.in" "${CMAKE_CURRENT_BINARY_DIR}/qt_lib_dtkdeclarative.pri" @ONLY)
154149
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt_lib_dtkdeclarative.pri" DESTINATION "${MKSPECS_INSTALL_DIR}")

‎chameleon/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
set(PLUGIN_NAME ${STYLE_PLUGIN_NAME})
22

3-
find_package(Dtk${DTK_VERSION_MAJOR}Gui REQUIRED)
3+
find_package(Dtk${DTK_NAME_SUFFIX}Gui REQUIRED)
44
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS
55
Qml
66
Quick
77
QuickControls2 REQUIRED
88
)
9-
if(EnableQt5)
9+
if(DTK5)
1010
find_package(Qt${QT_VERSION_MAJOR}QuickCompiler)
1111
endif()
1212

@@ -59,7 +59,7 @@ set(SRC_FILES
5959
qtquickcontrols2chameleonstyleplugin.h qtquickcontrols2chameleonstyleplugin.cpp
6060
)
6161

62-
if(EnableQt5)
62+
if(DTK5)
6363
file(GLOB _qml_files ${QML_FILES})
6464
set(TARGETPATH "QtQuick/Controls.2/Chameleon")
6565
set(PLUGIN_INSTALL_DIR "${QML_INSTALL_DIR}/${TARGETPATH}")
@@ -109,7 +109,7 @@ if(EnableQt5)
109109
)
110110
endif()
111111

112-
if(EnableQt6)
112+
if(NOT DTK5)
113113
qt_add_qml_module(${PLUGIN_NAME}
114114
URI "Chameleon"
115115
VERSION "1.0"

‎docs/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ set (DOXYGEN_GENERATE_QHP "YES" CACHE STRING "Doxygen QHP output")
1010
set (DOXYGEN_FILTER_PATTERNS *.qml=doxyqml CACHE STRING "Extra filter patterns")
1111
set (DOXYGEN_FILE_PATTERNS *.cpp *.h *.zh_CN.md *.zh_CN.dox *.qml CACHE STRING "Doxygen File Patterns")
1212
set (DOXYGEN_EXTENSION_MAPPING qml=C++ CACHE STRING "Extra extension mapping")
13-
set (DOXYGEN_PROJECT_NUMBER ${CMAKE_PROJECT_VERSION} CACHE STRING "") # Should be the same as this project is using.
13+
set (DOXYGEN_PROJECT_NUMBER ${DTK_VERSION} CACHE STRING "") # Should be the same as this project is using.
1414
set (DOXYGEN_EXTRACT_STATIC YES)
1515
set (DOXYGEN_OUTPUT_LANGUAGE "Chinese" CACHE STRING "Doxygen Output Language")
1616
set (DOXYGEN_IMAGE_PATH ${CMAKE_CURRENT_LIST_DIR}/images/)
17-
if (EnableQt5)
17+
if (DTK5)
1818
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Help)
1919
else()
2020
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS ToolsTools)

‎examples/exhibition/CMakeLists.txt‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
set(BIN_NAME dtk-exhibition)
1+
set(BIN_NAME dtk${DTK_NAME_SUFFIX}-exhibition)
22

33
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Quick QuickControls2)
4-
find_package(Dtk${DTK_VERSION_MAJOR}Core REQUIRED)
5-
find_package(Dtk${DTK_VERSION_MAJOR}Gui REQUIRED)
4+
find_package(Dtk${DTK_NAME_SUFFIX}Core REQUIRED)
5+
find_package(Dtk${DTK_NAME_SUFFIX}Gui REQUIRED)
66

77
set(CMAKE_EXE_LINKER_FLAGS "-z relro -z now -z noexecstack -pie -Wl,--as-needed")
88

9-
if (EnableQt5)
9+
if (DTK5)
1010
set(QML_RCS ${CMAKE_CURRENT_LIST_DIR}/qml.qrc)
11-
endif()
12-
if (EnableQt6)
11+
else()
1312
set(QML_RCS ${CMAKE_CURRENT_LIST_DIR}/qml-qt6.qrc)
1413
endif()
1514
add_executable(${BIN_NAME}
@@ -23,13 +22,13 @@ target_compile_options(${BIN_NAME} PRIVATE "-fpic")
2322
target_link_libraries(${BIN_NAME} PRIVATE
2423
Qt${QT_VERSION_MAJOR}::Quick
2524
Qt${QT_VERSION_MAJOR}::QuickControls2
26-
Dtk${DTK_VERSION_MAJOR}::Core
27-
Dtk${DTK_VERSION_MAJOR}::Gui
25+
Dtk${DTK_NAME_SUFFIX}::Core
26+
Dtk${DTK_NAME_SUFFIX}::Gui
2827
)
2928

3029
set(EXAMPLE_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}")
31-
if (EnableQt6)
32-
set(EXAMPLE_INSTALL_DIR "${LIB_INSTALL_DIR}/dtk${PROJECT_VERSION_MAJOR}/DDeclarative")
30+
if (NOT DTK5)
31+
set(EXAMPLE_INSTALL_DIR "${LIB_INSTALL_DIR}/dtk${DTK_VERSION_MAJOR}/DDeclarative")
3332
endif()
3433

3534
install(TARGETS ${BIN_NAME} DESTINATION ${EXAMPLE_INSTALL_DIR})

‎examples/qml-inspect/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
set(BIN_NAME qml-inspect)
22

33
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Quick QuickControls2)
4-
find_package(Dtk${DTK_VERSION_MAJOR}Core REQUIRED)
5-
find_package(Dtk${DTK_VERSION_MAJOR}Gui REQUIRED)
4+
find_package(Dtk${DTK_NAME_SUFFIX}Core REQUIRED)
5+
find_package(Dtk${DTK_NAME_SUFFIX}Gui REQUIRED)
66

77
add_executable(${BIN_NAME}
88
${CMAKE_CURRENT_LIST_DIR}/main.cpp
@@ -13,5 +13,5 @@ add_executable(${BIN_NAME}
1313
target_link_libraries(${BIN_NAME} PUBLIC
1414
Qt${QT_VERSION_MAJOR}::Quick
1515
Qt${QT_VERSION_MAJOR}::QuickControls2
16-
Dtk${DTK_VERSION_MAJOR}::Gui
16+
Dtk${DTK_NAME_SUFFIX}::Gui
1717
)

‎misc/DtkDeclarativeConfig.cmake.in‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
@PACKAGE_INIT@
22
include(CMakeFindDependencyMacro)
3-
find_dependency(Dtk@DTK_VERSION_MAJOR@Core)
4-
find_dependency(Dtk@DTK_VERSION_MAJOR@Gui)
3+
find_dependency(Dtk@DTK_NAME_SUFFIX@Core)
4+
find_dependency(Dtk@DTK_NAME_SUFFIX@Gui)
55
find_package(Qt@QT_VERSION_MAJOR@ COMPONENTS
66
Qml
77
Quick
88
REQUIRED
99
)
10-
include(${CMAKE_CURRENT_LIST_DIR}/Dtk@DTK_VERSION_MAJOR@DeclarativePropertiesTargets.cmake)
11-
include(${CMAKE_CURRENT_LIST_DIR}/Dtk@DTK_VERSION_MAJOR@DeclarativeTargets.cmake)
10+
include(${CMAKE_CURRENT_LIST_DIR}/Dtk@DTK_NAME_SUFFIX@DeclarativePropertiesTargets.cmake)
11+
include(${CMAKE_CURRENT_LIST_DIR}/Dtk@DTK_NAME_SUFFIX@DeclarativeTargets.cmake)
1212
set(DTK_QML_APP_PLUGIN_PATH @DTK_QML_APP_PLUGIN_PATH@)
13-
get_target_property(DtkDeclarative_INCLUDE_DIRS Dtk@DTK_VERSION_MAJOR@::Declarative INTERFACE_INCLUDE_DIRECTORIES)
14-
get_target_property(DtkDeclarative_LIBRARY_DIRS Dtk@DTK_VERSION_MAJOR@::Declarative INTERFACE_LINK_DIRECTORIES)
13+
get_target_property(DtkDeclarative_INCLUDE_DIRS Dtk@DTK_NAME_SUFFIX@::Declarative INTERFACE_INCLUDE_DIRECTORIES)
14+
get_target_property(DtkDeclarative_LIBRARY_DIRS Dtk@DTK_NAME_SUFFIX@::Declarative INTERFACE_LINK_DIRECTORIES)
1515
set(DTKDeclarative_INCLUDE_DIR ${DtkDeclarative_INCLUDE_DIRS})
16-
set(DtkDeclarative_LIBRARIES Dtk@DTK_VERSION_MAJOR@::Declarative)
17-
check_required_components(Dtk@DTK_VERSION_MAJOR@Core)
16+
set(DtkDeclarative_LIBRARIES Dtk@DTK_NAME_SUFFIX@::Declarative)
17+
check_required_components(Dtk@DTK_NAME_SUFFIX@Core)

‎misc/dtkdeclarative.pc.in‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
prefix=@CMAKE_INSTALL_PREFIX@
22
exec_prefix=${prefix}
33
libdir=${prefix}/@LIB_INSTALL_DIR@
4-
includedir=${prefix}/@INCLUDE_INSTALL_DIR@
4+
includedir=${prefix}/include/dtk@DTK_VERSION_MAJOR@/DDeclarative
55

6-
Name: DtkDeclarative
6+
Name: Dtk@DTK_NAME_SUFFIX@Declarative
77
Description: Deepin Tool Kit DtkDeclarative header files
8-
Version: @CMAKE_PROJECT_VERSION@
9-
Libs: -L${libdir} -ldtk@DTK_VERSION_MAJOR@declarative
8+
Version: @DTK_VERSION@
9+
Libs: -L${libdir} -ldtk@DTK_NAME_SUFFIX@declarative
1010
Cflags: -I${includedir}
11-
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
11+
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

‎misc/qt_lib_dtkdeclarative.pri.in‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
QT.dtkdeclarative.VERSION = @CMAKE_PROJECT_VERSION@
2-
QT.dtkdeclarative.MAJOR_VERSION = @PROJECT_VERSION_MAJOR@
3-
QT.dtkdeclarative.MINOR_VERSION = @PROJECT_VERSION_MINOR@
4-
QT.dtkdeclarative.PATCH_VERSION = @PROJECT_VERSION_PATCH@
1+
QT.dtkdeclarative.VERSION = @DTK_VERSION@
2+
QT.dtkdeclarative.MAJOR_VERSION = @DTK_VERSION_MAJOR@
3+
QT.dtkdeclarative.MINOR_VERSION = @DTK_VERSION_MINOR@
4+
QT.dtkdeclarative.PATCH_VERSION = @DTK_VERSION_PATCH@
55
QT.dtkdeclarative.name = dtkdeclarative
6-
QT.dtkdeclarative.module = dtk@DTK_VERSION_MAJOR@declarative
6+
QT.dtkdeclarative.module = dtk@DTK_NAME_SUFFIX@declarative
77
QT.dtkdeclarative.libs = @CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@
8-
QT.dtkdeclarative.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@
8+
QT.dtkdeclarative.includes = @CMAKE_INSTALL_PREFIX@/include/dtk@DTK_VERSION_MAJOR@/DDeclarative
99
QT.dtkdeclarative.frameworks =
1010
QT.dtkdeclarative.depends = core dbus xml gui dtkcore dtkgui quick quick_private
1111
QT.dtkdeclarative.module_config = v2 ltcg

‎qmlplugin/targets.cmake‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Qml Quick)
2-
find_package(Dtk${DTK_VERSION_MAJOR}Core REQUIRED)
3-
find_package(Dtk${DTK_VERSION_MAJOR}Gui REQUIRED)
2+
find_package(Dtk${DTK_NAME_SUFFIX}Core REQUIRED)
3+
find_package(Dtk${DTK_NAME_SUFFIX}Gui REQUIRED)
44

55
add_library(${PLUGIN_NAME}_interface INTERFACE)
66
target_sources(${PLUGIN_NAME}_interface INTERFACE
@@ -13,6 +13,6 @@ target_link_libraries(${PLUGIN_NAME}_interface INTERFACE
1313
Qt${QT_VERSION_MAJOR}::QmlPrivate
1414
Qt${QT_VERSION_MAJOR}::Quick
1515
Qt${QT_VERSION_MAJOR}::QuickPrivate
16-
Dtk${DTK_VERSION_MAJOR}::Core
17-
Dtk${DTK_VERSION_MAJOR}::Gui
16+
Dtk${DTK_NAME_SUFFIX}::Core
17+
Dtk${DTK_NAME_SUFFIX}::Gui
1818
)

‎qt6/src/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
include(${PROJECT_SOURCE_DIR}/src/targets.cmake)
22

3-
find_package(Qt${QT_DEFAULT_MAJOR_VERSION}ShaderTools)
3+
find_package(Qt${QT_VERSION_MAJOR}ShaderTools)
44

55
include(${PROJECT_SOURCE_DIR}/qt6/src/qml.cmake)
66
qt_add_qml_module(${LIB_NAME}
@@ -32,8 +32,8 @@ qt_add_translations(${LIB_NAME}
3232
)
3333

3434
set_target_properties(${LIB_NAME} PROPERTIES
35-
VERSION ${CMAKE_PROJECT_VERSION}
36-
SOVERSION ${CMAKE_PROJECT_VERSION_MAJOR}
35+
VERSION ${DTK_VERSION}
36+
SOVERSION ${DTK_VERSION_MAJOR}
3737
EXPORT_NAME Declarative
3838
)
3939

@@ -80,9 +80,9 @@ set_target_properties(${PLUGIN_NAME} PROPERTIES
8080
)
8181

8282
# Install library
83-
install(TARGETS ${LIB_NAME} EXPORT Dtk${DTK_VERSION_MAJOR}DeclarativeTargets DESTINATION "${LIB_INSTALL_DIR}")
83+
install(TARGETS ${LIB_NAME} EXPORT Dtk${DTK_NAME_SUFFIX}DeclarativeTargets DESTINATION "${LIB_INSTALL_DIR}")
8484
# Install export targets
85-
install(EXPORT Dtk${DTK_VERSION_MAJOR}DeclarativeTargets NAMESPACE Dtk${DTK_VERSION_MAJOR}:: FILE Dtk${DTK_VERSION_MAJOR}DeclarativeTargets.cmake DESTINATION "${CONFIG_INSTALL_DIR}")
85+
install(EXPORT Dtk${DTK_NAME_SUFFIX}DeclarativeTargets NAMESPACE Dtk${DTK_NAME_SUFFIX}:: FILE Dtk${DTK_NAME_SUFFIX}DeclarativeTargets.cmake DESTINATION "${CONFIG_INSTALL_DIR}")
8686
# Install translations
8787
install(FILES ${QM_FILES} DESTINATION "${TRANSLATIONS_INSTALL_PATH}")
8888
# Install plugin

0 commit comments

Comments
 (0)