42 lines
1.6 KiB
Diff
42 lines
1.6 KiB
Diff
|
From bcb66e042058c44dc3b2018ddfb2ce41e6bdc079 Mon Sep 17 00:00:00 2001
|
||
|
|
From: liuzhilin <liuzhilin@uniontech.com>
|
||
|
|
Date: Fri, 12 Apr 2024 16:31:04 +0800
|
||
|
|
Subject: [PATCH] fix-build-error
|
||
|
|
|
||
|
|
---
|
||
|
|
deepin-system-monitor-main/CMakeLists.txt | 3 +++
|
||
|
|
deepin-system-monitor-plugin-popup/CMakeLists.txt | 3 +++
|
||
|
|
2 files changed, 6 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/deepin-system-monitor-main/CMakeLists.txt b/deepin-system-monitor-main/CMakeLists.txt
|
||
|
|
index 035dad5..0f95bf2 100644
|
||
|
|
--- a/deepin-system-monitor-main/CMakeLists.txt
|
||
|
|
+++ b/deepin-system-monitor-main/CMakeLists.txt
|
||
|
|
@@ -68,6 +68,9 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty)
|
||
|
|
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/include)
|
||
|
|
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libsmartcols/src)
|
||
|
|
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../)
|
||
|
|
+include_directories(/usr/include/dtk5/DWidget/)
|
||
|
|
+include_directories(/usr/include/dtk5/DCore/)
|
||
|
|
+include_directories(/usr/include/dtk5/DGui/)
|
||
|
|
|
||
|
|
#安全测试加固编译参数
|
||
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -z relro -z now -z noexecstack -pie")
|
||
|
|
diff --git a/deepin-system-monitor-plugin-popup/CMakeLists.txt b/deepin-system-monitor-plugin-popup/CMakeLists.txt
|
||
|
|
index c430c98..0d0f7f8 100644
|
||
|
|
--- a/deepin-system-monitor-plugin-popup/CMakeLists.txt
|
||
|
|
+++ b/deepin-system-monitor-plugin-popup/CMakeLists.txt
|
||
|
|
@@ -278,6 +278,9 @@ target_include_directories(${PROJECT_NAME} PUBLIC
|
||
|
|
# ${Qt5Widgets_INCLUDE_DIRS}
|
||
|
|
# ${DtkWidget_INCLUDE_DIRS}
|
||
|
|
${DdeDockInterface_INCLUDE_DIRS}
|
||
|
|
+ /usr/include/dtk5/DWidget/
|
||
|
|
+ /usr/include/dtk5/DCore/
|
||
|
|
+ /usr/include/dtk5/DGui/
|
||
|
|
)
|
||
|
|
target_link_libraries(${PROJECT_NAME}
|
||
|
|
Qt5::Core
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|