Merge pull request #6 from kartikmohta/master

Small fixes for building with catkin_tools

Author: facontidavide

CMakeLists.txt

@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 2.8)
 
 find_package(Qt5 REQUIRED COMPONENTS Core Widgets PrintSupport Concurrent Xml)
 
+find_package(catkin QUIET)
 if(catkin_FOUND)
     message("--------------------------------------------------------------------")
     message("PlotJuggler is being built using CATKIN. ROS plugin will be compiled")
@@ -20,9 +21,8 @@ if(catkin_FOUND)
     catkin_package(
         INCLUDE_DIRS include
         CATKIN_DEPENDS ros_type_introspection
-        DEPENDS system_lib
+        DEPENDS
         )
-
 endif()
 
 
@@ -55,7 +55,6 @@ elseif()
 endif()
 
 
-add_subdirectory( common)
 add_subdirectory( color_widgets )
 add_subdirectory( qwt/src )
 add_subdirectory( plotter_gui )

color_widgets/CMakeLists.txt

@@ -18,7 +18,7 @@ SET( CW_SRC
     src/swatch.cpp
     )
 
-add_library(colorwidgets ${CW_SRC})
+add_library(colorwidgets STATIC ${CW_SRC})
 
 target_link_libraries(colorwidgets
     ${Qt5Widgets_LIBRARIES} )

common/CMakeLists.txt

@@ -54,5 +54,5 @@ if(catkin_FOUND)
        RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
      )
 elseif()
-    install(TARGETS PlotJuggler DESTINATION ${CMAKE_INSTALL_PREFIX}/bin  )
+    install(TARGETS PlotJuggler DESTINATION bin  )
 endif()

common/plotdata.cpp

@@ -22,5 +22,5 @@ if(catkin_FOUND)
         LIBRARY DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
         RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} )
 elseif()
-    install(TARGETS DataLoadCSV DESTINATION ${CMAKE_INSTALL_PREFIX}/bin  )
+    install(TARGETS DataLoadCSV DESTINATION bin  )
 endif()

plotter_gui/CMakeLists.txt

@@ -26,5 +26,5 @@ if(catkin_FOUND)
         LIBRARY DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
         RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} )
 elseif()
-    install(TARGETS DataLoadFB DESTINATION ${CMAKE_INSTALL_PREFIX}/bin  )
+    install(TARGETS DataLoadFB DESTINATION bin  )
 endif()

plugins/DataLoadCSV/CMakeLists.txt

@@ -25,5 +25,5 @@ if(catkin_FOUND)
         LIBRARY DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
         RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} )
 elseif()
-    install(TARGETS DataStreamSample DESTINATION ${CMAKE_INSTALL_PREFIX}/bin  )
+    install(TARGETS DataStreamSample DESTINATION bin  )
 endif()

plugins/DataLoadFB/CMakeLists.txt

@@ -7,6 +7,7 @@
 #include <mutex>
 #include <chrono>
 #include <thread>
+#include <math.h>
 
 DataStreamSample::DataStreamSample()
 {

plugins/DataStreamSample/CMakeLists.txt

@@ -27,6 +27,11 @@ QT5_WRAP_UI ( COMMON_UI_SRC
     )
 
 add_library( commonROS STATIC ${COMMON_SRC} ${COMMON_UI_SRC} )
+target_link_libraries( commonROS
+  ${Qt5Widgets_LIBRARIES}
+  ${Qt5Xml_LIBRARIES}
+  ${catkin_LIBRARIES}
+  )
 
 
 
@@ -43,14 +48,14 @@ QT5_WRAP_UI ( DATALOAD_UI_SRC
     )
 
 add_library( DataLoadROS SHARED ${DATALOAD_SRC} ${DATALOAD_UI_SRC} )
-target_link_libraries( DataLoadROS  ${catkin_LIBRARIES} commonROS)
+target_link_libraries( DataLoadROS  commonROS)
 
-add_dependencies(DataLoadROS 
+add_dependencies(DataLoadROS
     ${${PROJECT_NAME}_EXPORTED_TARGETS}
     ${catkin_EXPORTED_TARGETS}
     )
 
-#############  
+#############
 SET( DATASTREAM_SRC
     DataStreamROS/datastream_ROS.cpp
     DataStreamROS/datastream_ROS.h
@@ -62,14 +67,14 @@ QT5_WRAP_UI ( DATASTREAM_UI_SRC
     DataStreamROS/rostopicselector.ui )
 
 add_library( DataStreamROS SHARED ${DATASTREAM_SRC} ${DATASTREAM_UI_SRC} )
-target_link_libraries( DataStreamROS  ${catkin_LIBRARIES} commonROS )
+target_link_libraries( DataStreamROS  commonROS )
 
-add_dependencies(DataStreamROS 
+add_dependencies(DataStreamROS
     ${${PROJECT_NAME}_EXPORTED_TARGETS}
     ${catkin_EXPORTED_TARGETS}
     )
 
-#############  
+#############
 SET( PUBLISHER_SRC
     TopicPublisherROS/statepublisher_rostopic.cpp
     TopicPublisherROS/statepublisher_rostopic.h
@@ -80,7 +85,7 @@ QT5_WRAP_UI ( PUBLISHER_UI_SRC  )
 add_library( RosTopicPublisher SHARED ${PUBLISHER_SRC} ${PUBLISHER_UI_SRC} )
 target_link_libraries( RosTopicPublisher  ${catkin_LIBRARIES} commonROS )
 
-add_dependencies(RosTopicPublisher 
+add_dependencies(RosTopicPublisher
     ${${PROJECT_NAME}_EXPORTED_TARGETS}
     ${catkin_EXPORTED_TARGETS}
     )
@@ -102,5 +107,5 @@ if(catkin_FOUND)
         RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
         )
 elseif()
-    install(TARGETS DataLoadROS DataStreamROS RosTopicPublisher DESTINATION ${CMAKE_INSTALL_PREFIX}/bin  )
+    install(TARGETS DataLoadROS DataStreamROS RosTopicPublisher DESTINATION bin  )
 endif()