Skip to content

fix: recovery rpath #1134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Nov 6, 2025
Merged

fix: recovery rpath #1134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,16 @@ set(INCLUDE_INSTALL_RPEFIX "/usr/include/${PROJECT_NAME}")

set(PLUGIN_INSTALL_PATH ${LIBRARY_INSTALL_PREFIX}/plugins)
set(TOOLS_INSTALL_PATH ${LIBRARY_INSTALL_PREFIX}/tools)
# set install runtime path
set(CMAKE_INSTALL_RPATH ${LIBRARY_INSTALL_PREFIX} ${PLUGIN_PATH})

message(STATUS "LIBRARY_INSTALL_PREFIX ${LIBRARY_INSTALL_PREFIX}")
message(STATUS "RUNTIME_INSTALL_RPEFIX ${RUNTIME_INSTALL_RPEFIX}")
message(STATUS "SOURCES_INSTALL_RPEFIX ${SOURCES_INSTALL_RPEFIX}")
message(STATUS "INCLUDE_INSTALL_RPEFIX ${INCLUDE_INSTALL_RPEFIX}")
Copy link

@sourcery-ai sourcery-ai bot Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issue (typo): Repeated typo: 'RPEFIX' should likely be 'PREFIX' in variable names.

Please update 'RUNTIME_INSTALL_RPEFIX', 'SOURCES_INSTALL_RPEFIX', and 'INCLUDE_INSTALL_RPEFIX' to use 'PREFIX' instead of 'RPEFIX'.

Suggested implementation:

message(STATUS "RUNTIME_INSTALL_PREFIX ${RUNTIME_INSTALL_PREFIX}")
message(STATUS "INCLUDE_INSTALL_PREFIX ${INCLUDE_INSTALL_PREFIX}")

If the variables RUNTIME_INSTALL_RPEFIX and INCLUDE_INSTALL_RPEFIX are defined elsewhere in the file or project, you should also rename those definitions to use PREFIX instead of RPEFIX. Similarly, check for SOURCES_INSTALL_RPEFIX and update it to SOURCES_INSTALL_PREFIX wherever it appears.

message(STATUS "PLUGIN_INSTALL_PATH ${PLUGIN_INSTALL_PATH}")
message(STATUS "TOOLS_INSTALL_PATH ${TOOLS_INSTALL_PATH}")
message(STATUS "CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH}")

# build runtime path
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE})
Expand Down
6 changes: 1 addition & 5 deletions src/app/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,7 @@ static bool loadPlugins()
qInfo() << QString("run application in %0").arg(pluginsPath);
lifeCycle.setPluginPaths({ pluginsPath });

QString dependlibs = CustomPaths::global(CustomPaths::DependLibs);
QCoreApplication::addLibraryPath(dependlibs);
QCoreApplication::addLibraryPath(pluginsPath);

qInfo() << "Current library paths:" << QApplication::libraryPaths();
qInfo() << "Depend library paths:" << QApplication::libraryPaths();
Copy link

@sourcery-ai sourcery-ai bot Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion: The log message label may be misleading after removing library path additions.

Update the log label to match the actual library paths being shown, as the code no longer adds dependlibs or pluginsPath.

Suggested change
qInfo() << "Depend library paths:" << QApplication::libraryPaths();
qInfo() << "Current Qt library paths:" << QApplication::libraryPaths();

qInfo() << "Load plugin paths: " << dpf::LifeCycle::pluginPaths();

// read all plugins in setting paths
Expand Down
2 changes: 0 additions & 2 deletions src/plugins/template/wizard/maindialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ class MainDialog : public DTK_WIDGET_NAMESPACE::DAbstractDialog

signals:

private slots:
void closeMainWindow(); // 声明用于关闭主窗口的槽函数
private:
void setupUI(TemplateVector &templateVec);
MainDialogPrivate *const d;
Expand Down
Loading