fix: don't hardcode modules dir

Log: Use variable instead of hardcode for modules dir

Author: hillwoodroc

CMakeLists.txt

@@ -15,6 +15,8 @@ set(SECURITY_COMPILE, "-fstack-protector-all -fPIC")
 set(CMAKE_CXX_FLAGS, "${CMAKE_CXX_FLAGS} ${SECURITY_COMPILE}")
 set(CMAKE_C_FLAGS, "${CMAKE_C_FLAGS} ${SECURITY_COMPILE}")
 
+add_definitions(-DCMAKE_INSTALL_FULL_LIBDIR=\"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\")
+
 # coverage option
 # cmake -DENABLE_COVERAGE=ON ..
 OPTION (ENABLE_COVERAGE "Use gcov" OFF)

modules/examples/login/CMakeLists.txt

@@ -8,10 +8,12 @@ link_libraries(
 
 set(LIB_NAME login)
 
+set(MODULESDIR ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)
+
 aux_source_directory(. SRCS)
 
 # add_library(${LIB_NAME} STATIC ${SRCS})
 
 add_library(${LIB_NAME} SHARED ${SRCS})
 
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${MODULESDIR})

modules/examples/network/CMakeLists.txt

@@ -8,10 +8,12 @@ link_libraries(
 
 set(LIB_NAME network)
 
+set(MODULESDIR ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)
+
 aux_source_directory(. SRCS)
 
 # add_library(${LIB_NAME} STATIC ${SRCS})
 
 add_library(${LIB_NAME} SHARED ${SRCS})
 
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${MODULESDIR})

modules/examples/webview/CMakeLists.txt

@@ -11,6 +11,8 @@ link_libraries(
 
 set(LIB_NAME webview)
 
+set(MODULESDIR ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)
+
 aux_source_directory(. SRCS)
 
 # add_library(${LIB_NAME} STATIC ${SRCS})
@@ -22,4 +24,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 ${MODULESDIR})

modules/login/CMakeLists.txt

@@ -14,6 +14,8 @@ link_libraries(
 
 set(LIB_NAME login)
 
+set(MODULESDIR ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)
+
 aux_source_directory(. SRCS)
 
 # add_library(${LIB_NAME} STATIC ${SRCS})
@@ -22,4 +24,4 @@ add_library(${LIB_NAME} SHARED ${SRCS})
 
 set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/modules)
 
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${MODULESDIR})

modules/virtualkeyboard/CMakeLists.txt

@@ -8,10 +8,12 @@ link_libraries(
 
 set(LIB_NAME virtualkeyboard)
 
+set(MODULESDIR ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)
+
 aux_source_directory(. SRCS)
 
 add_library(${LIB_NAME} SHARED ${SRCS})
 
 set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/modules)
 
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${MODULESDIR})

src/global_util/modules_loader.cpp

@@ -15,7 +15,7 @@
 namespace dss {
 namespace module {
 
-const QString ModulesDir = "/usr/lib/dde-session-shell/modules";
+const QString ModulesDir = QString("%1/dde-session-shell/modules"),arg(CMAKE_INSTALL_FULL_LIBDIR);
 ModulesLoader::ModulesLoader(QObject *parent)
     : QThread(parent)
 {