Skip to content

Commit 98082f5

Browse files
committed
feat: Generic cmake (non-DDE) to avoid manual debugging changes
1 parent 61242ca commit 98082f5

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,9 @@ add_executable(${PROJECT_NAME} ${DIR})
3838
#endif ()
3939

4040
#find_package(Qt${QT_VERSION} COMPONENTS ${REQUIRED_LIBS} REQUIRED)
41-
target_link_libraries(${PROJECT_NAME} MonitorInfo lfxMonitorNet)
41+
42+
if (EXISTS "/usr/lib/dde-dock/plugins")
43+
target_link_libraries(${PROJECT_NAME} MonitorInfo lfxMonitorNet)
44+
else()
45+
target_link_libraries(${PROJECT_NAME} MonitorInfo)
46+
endif()

dde-dock-plugin/CMakeLists.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#set(DDE_DOCK_PLUGINS_PATH "/usr/lib/dde-dock/plugins")
2-
#if (EXISTS ${DDE_DOCK_PLUGINS_PATH})
1+
set(DDE_DOCK_PLUGINS_PATH "/usr/lib/dde-dock/plugins")
2+
if (EXISTS ${DDE_DOCK_PLUGINS_PATH})
33
set(PLUGIN_NAME "lfxMonitorNet")
44
set(CMAKE_AUTOUIC ON)
55

@@ -26,7 +26,6 @@
2626
install(FILES "MonitorNetConfig.json" DESTINATION "/usr/share/lfxNet")
2727
install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION "/usr/lib/dde-dock/plugins")
2828

29-
3029
# 参考:https://github.com/linuxdeepin/dde-dock/blob/master/plugins/plugin-guide/plugins-developer-guide.md
3130

3231
# 说明:
@@ -55,6 +54,6 @@
5554
# DockInterface_INCLUDE_DIRS
5655
# DockInterface_LIBRARIES
5756
# 还有有另外的一些变量以及更灵活的用法,比如一次性查找多个库
58-
#endif()
57+
endif()
5958

6059

0 commit comments

Comments
 (0)