fix: Respect CMAKE_INSTALL_LIBDIR for module installation and lookup

hillwoodroc · hillwoodroc · commit cf24bec0fdda · 2025-12-24T16:44:03.000+08:00
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
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,11 +1,17 @@
 cmake_minimum_required(VERSION 3.16)
 project(dde-session-shell C CXX)
 
+if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+    set(CMAKE_INSTALL_LIBDIR lib)
+endif()
+
 include(GNUInstallDirs)
 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)
diff --git a/plugins/assist_login/CMakeLists.txt b/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)
diff --git a/plugins/assist_login/interface/CMakeLists.txt b/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)
diff --git a/plugins/examples/login-plugins/login-basic/CMakeLists.txt b/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)
diff --git a/plugins/examples/login-plugins/login-complex/CMakeLists.txt b/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)
diff --git a/plugins/examples/login-plugins/login-fullManaged/CMakeLists.txt b/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)
diff --git a/plugins/examples/login-plugins/login-udcp/CMakeLists.txt b/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)
diff --git a/plugins/examples/tray-plugins/network/CMakeLists.txt b/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)
diff --git a/plugins/examples/tray-plugins/webview/CMakeLists.txt b/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)
diff --git a/plugins/one-key-login/CMakeLists.txt b/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)
diff --git a/src/global_util/plugin_manager/modules_loader.cpp b/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";

Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,4 @@ aux_source_directory(. SRCS)`
`12`	`12`
`13`	`13`	`add_library(${LIB_NAME} SHARED ${SRCS})`
`14`	`14`
`15`		`-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)`
	`15`	`+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)`
Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,4 @@ target_link_libraries(${LIB_NAME} PRIVATE`
`23`	`23`	`Qt${QT_VERSION_MAJOR}::WebEngineWidgets`
`24`	`24`	`)`
`25`	`25`
`26`		`-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)`
	`26`	`+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)`