fix: do not hardcode plugin install dir #361
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: hillwoodroc 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 |
|
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. |
这个会带上 |
单独给 debian 的 rule 文件定义一个路径是否可以？ |
|
或者在 CMakeLists.txt 文件里面加一行 include(GNUInstallDirs) 如何？ |
|
TAG Bot New tag: 0.0.23 |
意思是代码中找插件的路径这儿和这儿 及其debain install文件中定义的安装路径都要修改 |
|
/test all |
|
我加了个条件判断，不会影响 debian 的安装目录了。 |
|
又更新了一下，把 c++ 里面的死路径全部改为 QString 来获取的动态路径了。你们试试看有没有什么问题。 |
hillwoodroc
force-pushed
the
master
branch
2 times, most recently
from
8d0a03d
to
aa01113
Compare
|
/test all |
|
@hillwoodroc: Cannot trigger testing until a trusted user reviews the PR and leaves an In response to this:
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. |
Log: fix: do not hardcode plugin install dir for openSUSE and Fedora
| @@ -4,6 +4,16 @@ | |||
|
|
|||
| set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined") | |||
|
|
|||
| if((CMAKE_INSTALL_LIBDIR MATCHES "lib") OR (CMAKE_INSTALL_LIBDIR MATCHES "lib64")) | |||
| set(PLUGIN_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/dde-dock/tmp/plugins CACHE STRING "Plugin install path") | |||
| elseif(CMAKE_INSTALL_LIBDIR MATCHES "lib/*") | |||
There was a problem hiding this comment.
应该在 debian/rules 设置 -DPLUGIN_INSTALL_DIR ，最好不要在 cmake 做这些判断
Log: do not hardcode plugin install dir for openSUSE and fedora