fix: Respect CMAKE_INSTALL_LIBDIR for module installation and lookup

This ensures correct installation and runtime lookup on both lib and
lib64 based systems.

Log:
- Define CMAKE_INSTALL_FULL_LIBDIR in top-level CMakeLists.txt
- Replace hardcoded 'lib/dde-session-shell/modules' with
  '${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules' in all plugin
  CMakeLists
- Update modules_loader.cpp to use CMAKE_INSTALL_FULL_LIBDIR for
  locating modules and configs

Author: hillwoodroc

CMakeLists.txt

@@ -6,6 +6,8 @@ if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     set(CMAKE_INSTALL_PREFIX /usr)
 endif ()
 
+add_definitions(-DCMAKE_INSTALL_FULL_LIBDIR=\"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\")
+
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)

debian/rules

@@ -13,22 +13,22 @@ SYSTYPE=$(shell cat /etc/deepin-version | grep Type= | awk -F'=' '{print $$2}')
 
 ifeq ($(DEB_BUILD_ARCH), mipsel)
 override_dh_auto_configure:
-	dh_auto_configure -- LOCK_NO_QUIT=YES DISABLE_DEMO_VIDEO=YES DISABLE_TEXT_SHADOW=YES DISABLE_ANIMATIONS=YES USE_CURSOR_LOADING_ANI=YES
+	dh_auto_configure -- LOCK_NO_QUIT=YES DISABLE_DEMO_VIDEO=YES DISABLE_TEXT_SHADOW=YES DISABLE_ANIMATIONS=YES USE_CURSOR_LOADING_ANI=YES -DCMAKE_INSTALL_LIBDIR=lib
 endif
 
 ifeq ($(DEB_BUILD_ARCH), mips64el)
 override_dh_auto_configure:
-	dh_auto_configure -- LOCK_NO_QUIT=YES DISABLE_DEMO_VIDEO=YES DISABLE_TEXT_SHADOW=YES DISABLE_ANIMATIONS=YES USE_CURSOR_LOADING_ANI=YES
+	dh_auto_configure -- LOCK_NO_QUIT=YES DISABLE_DEMO_VIDEO=YES DISABLE_TEXT_SHADOW=YES DISABLE_ANIMATIONS=YES USE_CURSOR_LOADING_ANI=YES -DCMAKE_INSTALL_LIBDIR=lib
 endif
 
 ifeq ($(DEB_BUILD_ARCH), sw_64)
 override_dh_auto_configure:
-	dh_auto_configure -- LOCK_NO_QUIT=YES DISABLE_DEMO_VIDEO=YES DISABLE_TEXT_SHADOW=YES DISABLE_ANIMATIONS=YES USE_CURSOR_LOADING_ANI=YES
+	dh_auto_configure -- LOCK_NO_QUIT=YES DISABLE_DEMO_VIDEO=YES DISABLE_TEXT_SHADOW=YES DISABLE_ANIMATIONS=YES USE_CURSOR_LOADING_ANI=YES -DCMAKE_INSTALL_LIBDIR=lib
 endif
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		-DWAIT_DEEPIN_ACCOUNTS_SERVICE=1
+		-DWAIT_DEEPIN_ACCOUNTS_SERVICE=1 -DCMAKE_INSTALL_LIBDIR=lib
 
 ifeq ($(SYSTYPE), Professional)
 ifeq ($(DEB_BUILD_ARCH), amd64)

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)