Skip to content

Install plugins into lib tree #1228

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
facontidavide merged 1 commit into from
Dec 19, 2025
Merged

Install plugins into lib tree #1228

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
6 changes: 5 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,10 @@ else()
${PLOTJUGGLER_BASE_MOCS})
endif()

if(NOT PJ_PLUGIN_INSTALL_DIRECTORY)
set(PJ_PLUGIN_INSTALL_DIRECTORY "${CMAKE_INSTALL_PREFIX}/lib/plotjuggler-plugins")
endif()

target_include_directories(
plotjuggler_base
PUBLIC
Expand All @@ -255,6 +259,7 @@ target_compile_definitions(
PUBLIC PJ_MAJOR_VERSION=${PROJECT_VERSION_MAJOR}
PJ_MINOR_VERSION=${PROJECT_VERSION_MINOR}
PJ_PATCH_VERSION=${PROJECT_VERSION_PATCH}
PJ_PLUGIN_INSTALL_DIRECTORY=\"${PJ_PLUGIN_INSTALL_DIRECTORY}\"
FMT_HEADER_ONLY
$<$<BOOL:${COMPILING_WITH_CATKIN}>:COMPILED_WITH_CATKIN>
$<$<BOOL:${COMPILING_WITH_AMENT}>:COMPILED_WITH_AMENT>)
Expand Down Expand Up @@ -292,7 +297,6 @@ else()
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(PJ_PLUGIN_INSTALL_DIRECTORY bin)

endif()

Expand Down
1 change: 1 addition & 0 deletions plotjuggler_app/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,7 @@ void MainWindow::loadAllPlugins(QStringList command_line_plugin_folders)
plugin_folders += command_line_plugin_folders;
plugin_folders += settings.value("Preferences::plugin_folders", QStringList()).toStringList();
builtin_folders += QCoreApplication::applicationDirPath();
builtin_folders += PJ_PLUGIN_INSTALL_DIRECTORY;

try
{
Expand Down
Loading