From 8c9ff7ba3cd1ddf19c7a5c87ec858ba3bea08443 Mon Sep 17 00:00:00 2001
From: SammysHP <sven@sammyshp.de>
Date: Mon, 15 Dec 2025 13:51:07 +0100
Subject: [PATCH] Install plugins into lib tree

Fixes #1153
---
 CMakeLists.txt                 | 6 +++++-
 plotjuggler_app/mainwindow.cpp | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2fc2e217..d2351df87 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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
@@ -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>)
@@ -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()
 
diff --git a/plotjuggler_app/mainwindow.cpp b/plotjuggler_app/mainwindow.cpp
index 9f5f42a22..d71db2479 100644
--- a/plotjuggler_app/mainwindow.cpp
+++ b/plotjuggler_app/mainwindow.cpp
@@ -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
   {