Skip to content

Commit a6ad1ee

Browse files
committed
feat: cmake configuration make install directory
1 parent 9161dc0 commit a6ad1ee

2 files changed

Lines changed: 7 additions & 15 deletions

File tree

CMakeLists.txt

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR} ${TS_FILES})
2727
add_subdirectory(lib)
2828
add_subdirectory(dde-dock-plugin)
2929

30-
3130
# 加入一个配置头文件,用于处理 CMake 对源码的设置
3231
#configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in"
3332
# "${CMAKE_CURRENT_BINARY_DIR}/config.h")
@@ -41,18 +40,11 @@ file(GLOB DIR "widgets/*.h" "widgets/*.cpp" "widgets/*.ui" "*.h" "*.hpp" "*.cpp"
4140
# message(${v})
4241
#endforeach()
4342
add_executable(${PROJECT_NAME} ${DIR} ${QM_FILES})
44-
45-
#if (NOT CMAKE_PREFIX_PATH)
46-
# message(WARNING "CMAKE_PREFIX_PATH is not defined, you may need to set it "
47-
# "(-DCMAKE_PREFIX_PATH=\"path/to/Qt/lib/cmake\" or -DCMAKE_PREFIX_PATH=/usr/include/{host}/qt{version}/ on Ubuntu)")
48-
#endif ()
49-
50-
#find_package(Qt${QT_VERSION} COMPONENTS ${REQUIRED_LIBS} REQUIRED)
51-
52-
if (EXISTS "/usr/lib/dde-dock/plugins")
53-
target_link_libraries(${PROJECT_NAME} MonitorInfo NetPlugins)
54-
else()
55-
target_link_libraries(${PROJECT_NAME} MonitorInfo)
56-
endif()
43+
target_link_libraries(${PROJECT_NAME} MonitorInfo)
5744

5845
install(FILES "./resource/data/NetSpeed.json" DESTINATION "/usr/share/NetSpeed")
46+
install(FILES "./resource/NetSpeed.desktop" DESTINATION "/usr/share/applications")
47+
file(GLOB TRANSLATIONS "${CMAKE_CURRENT_BINARY_DIR}/*.qm") # 要带上构建生成的路径
48+
install(FILES ${TRANSLATIONS}
49+
DESTINATION "/usr/share/NetSpeed/translations")
50+
install(TARGETS ${PROJECT_NAME} DESTINATION "/usr/bin/NetSpeed")

dde-dock-plugin/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if (EXISTS ${DDE_DOCK_PLUGINS_PATH})
2424

2525
#set(CMAKE_INSTALL_PREFIX "/usr") # 默认为 "/usr/local", 若指定 / 的绝对路径,则 install 命令使用此变量作作为前缀会失效
2626
install(FILES "NetPlugins.json" DESTINATION "/usr/share/NetSpeed")
27-
install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION "/usr/lib/dde-dock/plugins")
27+
install(TARGETS ${PLUGIN_NAME} DESTINATION "/usr/lib/dde-dock/plugins")
2828

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

0 commit comments

Comments
 (0)