Now supporting building as a submodule of PJ.

Author: ozzdemir

CMakeLists.txt

@@ -1,11 +1,16 @@
 cmake_minimum_required(VERSION 3.7)
 
-project(plotjuggler_can_plugins)
+if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
+    # Standalone build, call project and look for PlotJuggler
+    project(plotjuggler_can_plugins)
 
-set(CMAKE_MODULE_PATH
-    ${CMAKE_MODULE_PATH}
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
-)
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+    find_package(PlotJuggler REQUIRED)
+else()
+    # Included from project (assuming from PlotJuggler)
+    # Set PlotJuggler_LIBRARY manually since find_package fails in this configuration.
+    set(PlotJuggler_LIBRARY plotjuggler_base)
+endif()
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
@@ -33,7 +38,6 @@ find_package(Qt5 REQUIRED COMPONENTS
 find_package(Qt5 OPTIONAL_COMPONENTS
     SerialBus
 )
-find_package(PlotJuggler REQUIRED)
 
 include_directories(
     ${Qt5Core_INCLUDE_DIRS}
@@ -42,7 +46,7 @@ include_directories(
     ${Qt5Xml_INCLUDE_DIRS}
     ${PlotJuggler_INCLUDE_DIRS}
     ${Qt5Svg_INCLUDE_DIRS}
-    ./3rdparty/dbcppp/include
+    3rdparty/dbcppp/include
 )
 
 set(PJ_LIBRARIES

README.md

@@ -17,7 +17,7 @@ To build any plugin, PlotJuggler must be installed in your system.
 
 For instance, in Linux, you should perform a full compilation and installation:
 
-```
+```BASH
 git clone --recurse-submodules https://github.com/facontidavide/PlotJuggler.git
 cd PlotJuggler
 mkdir build; cd build
@@ -26,7 +26,7 @@ make -j
 sudo make install
 ```
 After successfull installation of PlotJuggler, one can build DataLoadCAN and DataStreamCAN plugins as follows.
-```
+```BASH
 git clone --recurse-submodules https://github.com/PlotJuggler/plotjuggler-CAN-dbs.git
 cd plotjuggler-CAN-dbs
 mkdir build; cd build
@@ -35,6 +35,19 @@ make
 
 ```
 
+An alternative approach is including this project in a local copy of PlotJuggler. This approach might be preferable on Windows or AppImage builds
+```BASH
+git clone --recurse-submodules https://github.com/facontidavide/PlotJuggler.git
+cd PlotJuggler/plotjuggler_plugins
+git clone --recurse-submodules https://github.com/PlotJuggler/plotjuggler-CAN-dbs.git
+# Add the following line in the CMakeList.txt of the PlotJuggler, just after other plugin include lines
+# add_subdirectory( plotjuggler_plugins/plotjuggler-CAN-dbs )
+cd ../; mkdir build; cd build # Create a build folder in the root of PlotJuggler
+cmake ..
+make -j
+sudo make install # In this approach, system-wide install is optional, you can diretly use the PJ inside the bin with CAN plugins included
+```
+
 # Using the plugins
 
 After building the plugins, one needs to include build directory to the plugins directory of the PlotJuggler.