fix: Respect CMAKE_INSTALL_LIBDIR for module installation and lookup #48
Conversation
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
|
Hi @hillwoodroc. Thanks for your PR. 😃 |
Synchronize source files from linuxdeepin/dde-session-shell. Source-pull-request: linuxdeepin/dde-session-shell#48
|
Hi @hillwoodroc. Thanks for your PR. I'm waiting for a linuxdeepin member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: hillwoodroc, yixinshark The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
| set(CMAKE_INSTALL_PREFIX /usr) | ||
| endif () | ||
|
|
||
| add_definitions(-DCMAKE_INSTALL_FULL_LIBDIR=\"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\") |
There was a problem hiding this comment.
只要include 了 GNUInstallDirs 模块，CMAKE_INSTALL_FULL_LIBDIR 是可以自动生成的。不要手动拼
https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html
你可以用 “-DCMAKE_INSTALL_FULL_LIBDIR="${CMAKE_INSTALL_FULL_LIBDIR}"”
There was a problem hiding this comment.
这是为了和后面的 install 语句的 ${CMAKE_INSTALL_LIBDIR} 路径相匹配。install 语句用的相对路径。-DCMAKE_INSTALL_FULL_LIBDIR 无法直接传过去。
This ensures correct installation and runtime lookup on both lib and lib64 based systems.
Log: