From c401cb1df2ccad7ad0c2470227c5343fc6bd6def Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 11 Aug 2022 09:35:21 +0800 Subject: [PATCH] chore: use GNUInstallDirs in CmakeLists MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Log: cmake 在 install 时优先使用 GNUInstallDirs --- CMakeLists.txt | 4 ++-- frame/CMakeLists.txt | 2 +- plugins/keyboard-layout/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d00c027e0..fd80752ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,7 +114,7 @@ install(FILES ${QM_FILES} ## dev files install(FILES ${INTERFACES} - DESTINATION include/dde-dock) + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dde-dock) install(FILES ${CMAKE_BINARY_DIR}/dde-dock.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) @@ -123,7 +123,7 @@ install(FILES "cmake/DdeDock/DdeDockConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/DdeDock) install(FILES gschema/com.deepin.dde.dock.module.gschema.xml - DESTINATION share/glib-2.0/schemas) + DESTINATION ${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas) # Address Sanitizer 内存错误检测工具,打开下面的编译选项可以看到调试信息,正常运行时不需要这些信息 #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fsanitize=address -O2") diff --git a/frame/CMakeLists.txt b/frame/CMakeLists.txt index 15cc48ff5..88c9e0c4b 100644 --- a/frame/CMakeLists.txt +++ b/frame/CMakeLists.txt @@ -92,6 +92,6 @@ if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64") endif() # bin -install(TARGETS ${BIN_NAME} DESTINATION bin) +install(TARGETS ${BIN_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) dconfig_meta_files(APPID org.deepin.dde.dock FILES ../configs/org.deepin.dde.dock.json) diff --git a/plugins/keyboard-layout/CMakeLists.txt b/plugins/keyboard-layout/CMakeLists.txt index b4ae67134..7dbbb1171 100644 --- a/plugins/keyboard-layout/CMakeLists.txt +++ b/plugins/keyboard-layout/CMakeLists.txt @@ -43,4 +43,4 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE ) install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins/system-trays/) -install(FILES ./keybord_layout.json DESTINATION /etc/dde-dock/indicator) +install(FILES ./keybord_layout.json DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dde-dock/indicator)