Skip to content

Commit 3fc13bf

Browse files
sync: from linuxdeepin/dtkwidget
Synchronize source files from linuxdeepin/dtkwidget. Source-pull-request: linuxdeepin/dtkwidget#716
1 parent cc1566b commit 3fc13bf

File tree

13 files changed

+78
-71
lines changed

13 files changed

+78
-71
lines changed

CMakeLists.txt

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
cmake_minimum_required(VERSION 3.13)
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)
65

76
project(DtkWidget
8-
VERSION ${DTK_VERSION}
7+
VERSION ${FILE_VERSION}
98
DESCRIPTION "DTK Widget module"
109
HOMEPAGE_URL "https://github.com/linuxdeepin/dtkwidget"
1110
LANGUAGES CXX C
@@ -19,13 +18,18 @@ endif()
1918
include(GNUInstallDirs)
2019
include(CMakePackageConfigHelpers)
2120

22-
if("${PROJECT_VERSION_MAJOR}" STREQUAL "5")
23-
set(QT_VERSION_MAJOR 5)
24-
include(dtkwidget.cmake)
25-
elseif("${PROJECT_VERSION_MAJOR}" STREQUAL "6")
26-
set(QT_VERSION_MAJOR "6")
27-
set(DTK_VERSION_MAJOR "6")
28-
include(dtkwidget.cmake)
21+
option(DTK5 "Build DTK5." ON)
22+
if(DTK5)
23+
set(DTK_VERSION_MAJOR "5")
24+
set(DTK_NAME_SUFFIX "")
2925
else()
30-
message(SEND_ERROR "not support Prject Version ${PROJECT_VERSION}.")
26+
set(DTK_VERSION_MAJOR "6")
27+
set(DTK_NAME_SUFFIX "6")
3128
endif()
29+
30+
set(DTK_VERSION_MINOR ${PROJECT_VERSION_MINOR})
31+
set(DTK_VERSION_PATCH ${PROJECT_VERSION_PATCH})
32+
set(DTK_VERSION "${DTK_VERSION_MAJOR}.${DTK_VERSION_MINOR}.${DTK_VERSION_PATCH}")
33+
set(QT_VERSION_MAJOR ${DTK_VERSION_MAJOR})
34+
35+
include(dtkwidget.cmake)

docs/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set (DOXYGEN_GENERATE_HTML "YES" CACHE STRING "Doxygen HTML output")
66
set (DOXYGEN_GENERATE_XML "YES" CACHE STRING "Doxygen XML output")
77
set (DOXYGEN_GENERATE_QHP "YES" CACHE STRING "Doxygen QHP output")
88
set (DOXYGEN_FILE_PATTERNS *.cpp *.h *.zh_CN.md *.zh_CN.dox CACHE STRING "Doxygen File Patterns")
9-
set (DOXYGEN_PROJECT_NUMBER ${CMAKE_PROJECT_VERSION} CACHE STRING "") # Should be the same as this project is using.
9+
set (DOXYGEN_PROJECT_NUMBER ${DTK_VERSION} CACHE STRING "") # Should be the same as this project is using.
1010
set (DOXYGEN_EXTRACT_STATIC YES)
1111
set (DOXYGEN_OUTPUT_LANGUAGE "Chinese" CACHE STRING "Doxygen Output Language")
1212
set (DOXYGEN_IMAGE_PATH ${CMAKE_CURRENT_LIST_DIR}/images/)

dtkwidget.cmake

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
set(LIBNAME dtk${DTK_VERSION_MAJOR}widget)
2-
set(DtkWidget Dtk${DTK_VERSION_MAJOR}Widget)
1+
set(LIB_NAME dtk${DTK_NAME_SUFFIX}widget)
2+
set(DtkWidget Dtk${DTK_NAME_SUFFIX}Widget)
33

44
set(CMAKE_CXX_STANDARD 17)
55
set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -16,10 +16,10 @@ set(BUILD_VERSION "0" CACHE STRING "buildversion")
1616
set(BUILD_PLUGINS ON CACHE BOOL "Build plugin and plugin example")
1717

1818
set(INCLUDE_INSTALL_DIR
19-
"${CMAKE_INSTALL_INCLUDEDIR}/dtk${PROJECT_VERSION_MAJOR}/DWidget"
19+
"${CMAKE_INSTALL_INCLUDEDIR}/dtk${DTK_VERSION_MAJOR}/DWidget"
2020
)
2121
set(TOOL_INSTALL_DIR
22-
"${CMAKE_INSTALL_LIBDIR}/dtk${PROJECT_VERSION_MAJOR}/DWidget/bin"
22+
"${CMAKE_INSTALL_LIBEXECDIR}/dtk${DTK_VERSION_MAJOR}/DWidget/bin"
2323
)
2424
set(LIBRARY_INSTALL_DIR
2525
"${CMAKE_INSTALL_LIBDIR}"
@@ -37,7 +37,7 @@ set(PKGCONFIG_INSTALL_DIR
3737
CACHE STRING "Install directory for pkgconfig files"
3838
)
3939

40-
find_package(Dtk${DTK_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui)
40+
find_package(Dtk${DTK_NAME_SUFFIX} REQUIRED COMPONENTS Core Gui)
4141
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core
4242
Network
4343
Concurrent
@@ -143,8 +143,8 @@ write_basic_package_version_file(
143143
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DtkWidget}Config.cmake DESTINATION ${CONFIG_CMAKE_INSTALL_DIR})
144144
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DtkWidget}ConfigVersion.cmake DESTINATION ${CONFIG_CMAKE_INSTALL_DIR})
145145

146-
configure_file(misc/DtkWidget.pc.in ${LIBNAME}.pc @ONLY)
147-
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LIBNAME}.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
146+
configure_file(misc/DtkWidget.pc.in ${LIB_NAME}.pc @ONLY)
147+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
148148

149149
configure_file(misc/qt_lib_DtkWidget.pri.in qt_lib_DtkWidget.pri @ONLY)
150150
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qt_lib_DtkWidget.pri DESTINATION "${MKSPECS_INSTALL_DIR}")

examples/PrintPreviewSettingsPlugin/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ add_library(${PLUGIN_NAME} SHARED
88
)
99

1010
target_link_libraries(${PLUGIN_NAME} PRIVATE
11-
${LIBNAME}
11+
${LIB_NAME}
1212
)

examples/collections/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ target_link_libraries(${BIN_NAME} PRIVATE
5353
Qt${QT_VERSION_MAJOR}::Widgets
5454
Qt${QT_VERSION_MAJOR}::Gui
5555
Qt${QT_VERSION_MAJOR}::GuiPrivate
56-
${LIBNAME}
56+
${LIB_NAME}
5757
)
5858
install(
5959
TARGETS ${BIN_NAME}
60-
DESTINATION "${CMAKE_INSTALL_LIBDIR}/dtk${PROJECT_VERSION_MAJOR}/DWidget/examples/"
60+
DESTINATION "${CMAKE_INSTALL_LIBDIR}/dtk${DTK_VERSION_MAJOR}/DWidget/examples/"
6161
)

misc/DtkWidget.pc.in

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ exec_prefix=${prefix}
33
libdir=${prefix}/@LIBRARY_INSTALL_DIR@
44
includedir=${prefix}/@INCLUDE_INSTALL_DIR@
55

6-
Name: dtk@DTK_VERSION_MAJOR@widget
7-
Description: Deepin Tool Kit dtkwidget header files
8-
Version: @CMAKE_PROJECT_VERSION@
9-
Libs: -L${libdir} -ldtk@DTK_VERSION_MAJOR@widget
10-
Cflags: -I${includedir}
11-
Requires: dtk@DTK_VERSION_MAJOR@core dtk@DTK_VERSION_MAJOR@gui Qt@QT_VERSION_MAJOR@Core Qt@QT_VERSION_MAJOR@Widgets Qt@QT_VERSION_MAJOR@DBus Qt@QT_VERSION_MAJOR@Network Qt@QT_VERSION_MAJOR@PrintSupport
6+
Name: Dtk@DTK_NAME_SUFFIX@Widget
7+
Description: Deepin Tool Kit Widget library
8+
Version: @DTK_VERSION@
9+
Libs: -L${libdir} -ldtk@DTK_NAME_SUFFIX@widget
10+
Cflags: -I${includedir}/dtk@DTK_VERSION_MAJOR@/DWidget
11+
Requires: dtk@DTK_NAME_SUFFIX@core dtk@DTK_NAME_SUFFIX@gui Qt@QT_VERSION_MAJOR@Core Qt@QT_VERSION_MAJOR@Widgets Qt@QT_VERSION_MAJOR@DBus Qt@QT_VERSION_MAJOR@Network Qt@QT_VERSION_MAJOR@PrintSupport

misc/DtkWidgetConfig.cmake.in

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
@PACKAGE_INIT@
22

33
include(CMakeFindDependencyMacro)
4-
find_dependency(Dtk@DTK_VERSION_MAJOR@Core)
5-
find_dependency(Dtk@DTK_VERSION_MAJOR@Gui)
4+
find_dependency(Dtk@DTK_NAME_SUFFIX@Core)
5+
find_dependency(Dtk@DTK_NAME_SUFFIX@Gui)
66
find_dependency(Qt@QT_VERSION_MAJOR@Core)
77
find_dependency(Qt@QT_VERSION_MAJOR@Widgets)
88
find_dependency(Qt@QT_VERSION_MAJOR@DBus)
99
find_dependency(Qt@QT_VERSION_MAJOR@Network)
1010
find_dependency(Qt@QT_VERSION_MAJOR@PrintSupport)
11-
include(${CMAKE_CURRENT_LIST_DIR}/Dtk@DTK_VERSION_MAJOR@WidgetTargets.cmake)
12-
set(DtkWidget_LIBRARIES Dtk@DTK_VERSION_MAJOR@::Widget)
13-
get_target_property(DtkWidget_INCLUDE_DIRS Dtk@DTK_VERSION_MAJOR@::Widget INTERFACE_INCLUDE_DIRECTORIES)
14-
get_target_property(DtkWidget_LIBRARY_DIRS Dtk@DTK_VERSION_MAJOR@::Widget INTERFACE_LINK_DIRECTORIES)
11+
include(${CMAKE_CURRENT_LIST_DIR}/Dtk@DTK_NAME_SUFFIX@WidgetTargets.cmake)
12+
set(DtkWidget_LIBRARIES Dtk@DTK_NAME_SUFFIX@::Widget)
13+
get_target_property(DtkWidget_INCLUDE_DIRS Dtk@DTK_NAME_SUFFIX@::Widget INTERFACE_INCLUDE_DIRECTORIES)
14+
get_target_property(DtkWidget_LIBRARY_DIRS Dtk@DTK_NAME_SUFFIX@::Widget INTERFACE_LINK_DIRECTORIES)
1515
set(DtkWidget_TOOL_DIRS "@PACKAGE_TOOL_INSTALL_DIR@")
1616
check_required_components(DtkWidget)
1717

misc/qt_lib_DtkWidget.pri.in

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
QT.dtkwidget.VERSION = @PROJECT_VERSION@
2-
QT.dtkwidget.MAJOR_VERSION = @PROJECT_VERSION_MAJOR@
3-
QT.dtkwidget.MINOR_VERSION = @PROJECT_VERSION_MINOR@
4-
QT.dtkwidget.PATCH_VERSION = @PROJECT_VERSION_PATCH@
5-
QT.dtkwidget.name = dtkwidget
6-
QT.dtkwidget.module = dtk@DTK_VERSION_MAJOR@widget
1+
QT.dtkwidget.VERSION = @DTK_VERSION@
2+
QT.dtkwidget.MAJOR_VERSION = @DTK_VERSION_MAJOR@
3+
QT.dtkwidget.MINOR_VERSION = @DTK_VERSION_MINOR@
4+
QT.dtkwidget.PATCH_VERSION = @DTK_VERSION_PATCH@
5+
QT.dtkwidget.name = dtk@DTK_NAME_SUFFIX@widget
6+
QT.dtkwidget.module = dtk@DTK_NAME_SUFFIX@widget
77
QT.dtkwidget.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@
88
QT.dtkwidget.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@
99
QT.dtkwidget.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@

plugin/dtkuidemo/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ target_link_libraries(${DEMO} PRIVATE
1818
Qt${QT_VERSION_MAJOR}::Core
1919
Qt${QT_VERSION_MAJOR}::Gui
2020
Qt${QT_VERSION_MAJOR}::GuiPrivate
21-
${LIBNAME}
21+
${LIB_NAME}
2222
)

plugin/dtkuiplugin/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ project(${UIPLUGIN} VERSION 1.0.0 LANGUAGES CXX)
33

44
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS UiPlugin Gui)
55

6-
set(LIB_DWIDGET ${LIBNAME})
6+
set(LIB_DWIDGET ${LIB_NAME})
77

88
if (CMAKE_PROJECT_NAME STREQUAL ${UIPLUGIN})
99
message(STATUS "compile ${UIPLUGIN} individually")
@@ -16,8 +16,8 @@ if (CMAKE_PROJECT_NAME STREQUAL ${UIPLUGIN})
1616
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
1717
set(CMAKE_INSTALL_PREFIX /usr)
1818
endif()
19-
find_package(Dtk${DTK_VERSION_MAJOR} REQUIRED COMPONENT Widget)
20-
set(LIB_DWIDGET Dtk${DTK_VERSION_MAJOR}::Widget)
19+
find_package(Dtk${DTK_NAME_SUFFIX} REQUIRED COMPONENT Widget)
20+
set(LIB_DWIDGET Dtk${DTK_NAME_SUFFIX}::Widget)
2121
endif()
2222

2323
add_library(

0 commit comments

Comments
 (0)