sync: from linuxdeepin/dde-session-shell

Synchronize source files from linuxdeepin/dde-session-shell.

Source-pull-request: linuxdeepin/dde-session-shell#48

Author: deepin-ci-robot

plugins/assist_login/CMakeLists.txt

@@ -20,4 +20,4 @@ aux_source_directory(. SRCS)
 add_library(${LIB_NAME} SHARED ${SRCS})
 
 add_subdirectory(interface)
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)

plugins/assist_login/interface/CMakeLists.txt

@@ -28,4 +28,4 @@ link_libraries(
 
 # 安装/user/lib
 install(FILES include/assist_login_interface.h DESTINATION /usr/include/dde-session-shell)
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)

plugins/examples/login-plugins/login-basic/CMakeLists.txt

@@ -81,4 +81,4 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE
 set(CMAKE_INSTALL_PREFIX "/usr")
 
 # 设置执行 make install 时哪个目标应该被 install 到哪个位置
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)

plugins/examples/login-plugins/login-complex/CMakeLists.txt

@@ -12,4 +12,4 @@ aux_source_directory(. SRCS)
 
 add_library(${LIB_NAME} SHARED ${SRCS})
 
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)

plugins/examples/login-plugins/login-fullManaged/CMakeLists.txt

@@ -12,4 +12,4 @@ aux_source_directory(. SRCS)
 
 add_library(${LIB_NAME} SHARED ${SRCS})
 
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)

plugins/examples/login-plugins/login-udcp/CMakeLists.txt

@@ -12,4 +12,4 @@ aux_source_directory(. SRCS)
 
 add_library(${LIB_NAME} SHARED ${SRCS} login-plugin.qrc)
 
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)

plugins/examples/tray-plugins/network/CMakeLists.txt

@@ -12,4 +12,4 @@ aux_source_directory(. SRCS)
 
 add_library(${LIB_NAME} SHARED ${SRCS})
 
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)

plugins/examples/tray-plugins/webview/CMakeLists.txt

@@ -23,4 +23,4 @@ target_link_libraries(${LIB_NAME} PRIVATE
     Qt${QT_VERSION_MAJOR}::WebEngineWidgets
 )
 
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)

plugins/one-key-login/CMakeLists.txt

@@ -12,4 +12,4 @@ aux_source_directory(. SRCS)
 
 add_library(${LIB_NAME} SHARED ${SRCS})
 
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)

src/global_util/plugin_manager/modules_loader.cpp

@@ -16,8 +16,8 @@
 
 #include <unistd.h>
 
-const QString ModulesDir = "/usr/lib/dde-session-shell/modules";
-const QString ModulesConfigDir = "/usr/lib/dde-session-shell/modules/config.d/";
+const QString ModulesDir = QString("%1/dde-session-shell/modules").arg(CMAKE_INSTALL_FULL_LIBDIR);
+const QString ModulesConfigDir = QString("%1/dde-session-shell/modules/config.d/").arg(CMAKE_INSTALL_FULL_LIBDIR);
 const QString LOWEST_VERSION = "1.1.0";
 const QString LoginType = "Login";
 const QString TrayType = "Tray";