Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update build dependencies and cmake configuration #386

Merged
merged 1 commit into from
Jan 20, 2025
Merged

chore: update build dependencies and cmake configuration #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 24 additions & 19 deletions debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,30 @@ Priority: optional
Maintainer: Deepin Packages Builder <[email protected]>
Build-Depends:
debhelper (>= 11),
cmake,
pkg-config,
qt6-base-dev | qtbase5-dev,
qt6-svg-dev | libqt5svg5-dev,
qt6-tools-dev | qttools5-dev,
libdtk6core-dev | libdtkcore-dev,
libdtk6gui-dev | libdtkgui-dev,
libdtk6widget-dev | libdtkwidget-dev,
libxcb1-dev,
libxext-dev,
libpcap-dev,
qt6-tools-dev-tools | qttools5-dev-tools,
libicu-dev,
deepin-gettext-tools,
libxcb-util0-dev,
libxcb-icccm4-dev,
libnl-3-dev,
libnl-route-3-dev,
libudev-dev,
cmake,
pkg-config,
qt5-qmake,
qtbase5-dev,
libdtkcore-dev,
libdtkcore5-bin,
qttools5-dev-tools,
qt6-base-dev,
qt6-svg-dev,
qt6-tools-dev,
libdtk6core-dev,
libdtk6gui-dev,
libdtk6widget-dev,
libxcb1-dev,
libxext-dev,
libpcap-dev,
qt6-tools-dev-tools,
libicu-dev,
deepin-gettext-tools,
libxcb-util0-dev,
libxcb-icccm4-dev,
libnl-3-dev,
libnl-route-3-dev,
libudev-dev,
dde-tray-loader-dev | dde-dock-dev,
libgtest-dev,
libgmock-dev,
Expand Down
9 changes: 7 additions & 2 deletions deepin-system-monitor-daemon/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,18 @@ endforeach()
file(GLOB_RECURSE SRC_CPP ${CMAKE_CURRENT_LIST_DIR}/src/*.cpp)
file(GLOB_RECURSE SRC_H ${CMAKE_CURRENT_LIST_DIR}/src/*.h)

set(QT_VERSION_MAJOR 5)
set(DTK_VERSION_MAJOR)
set(QT_NS Qt${QT_VERSION_MAJOR})
set(DTK_NS Dtk${DTK_VERSION_MAJOR})

find_package(${QT_NS} COMPONENTS Core DBus REQUIRED)
find_package(${DTK_NS} REQUIRED COMPONENTS Core)

if (QT_VERSION_MAJOR LESS 6)
qt5_add_resources(RESOURCES_FILE assets/${BIN_NAME}.qrc)
qt5_add_resources(RESOURCES_FILE assets/${BIN_NAME}.qrc)
else()
qt6_add_resources(RESOURCES_FILE assets/${BIN_NAME}.qrc)
qt6_add_resources(RESOURCES_FILE assets/${BIN_NAME}.qrc)
endif()

add_library(${BIN_NAME} MODULE
Expand Down
Loading