Skip to content
Permalink
Browse files

Fixing rosbag inspector compilation

  • Loading branch information...
dorodnic committed Jun 25, 2019
1 parent daf34e6 commit 22bf5095b27ba57ea97632f8da351ac493089cce
Showing with 9 additions and 4 deletions.
  1. +7 −2 tools/rosbag-inspector/CMakeLists.txt
  2. +2 −2 tools/rosbag-inspector/rs-rosbag-inspector.cpp
@@ -13,20 +13,25 @@ if(BUILD_GRAPHICAL_EXAMPLES)
print_helpers.h
rosbag_content.h
../../common/os.cpp
../../third-party/glad/glad.c
../../third-party/imgui/imgui.cpp
../../third-party/imgui/imgui_draw.cpp
../../third-party/imgui/imgui_impl_glfw.cpp
../../third-party/imgui/imgui-fonts-karla.hpp
../../third-party/imgui/imgui-fonts-fontawesome.hpp
../../third-party/tinyfiledialogs/tinyfiledialogs.c
../../third-party/tinyfiledialogs/tinyfiledialogs.h
)

if(WIN32)
add_executable(rs-rosbag-inspector WIN32 ${RS_ROSBAG_INSPECTOR_CPP})

include_directories(rs-rosbag-inspector ../../third-party/imgui ../../common ../../third-party ${CMAKE_CURRENT_SOURCE_DIR}/res/)
include_directories(rs-rosbag-inspector ../../third-party/imgui ../../common ../../third-party/glad
../../third-party/tinyfiledialogs ../../third-party ${CMAKE_CURRENT_SOURCE_DIR}/res/)
else()
add_executable(rs-rosbag-inspector ${RS_ROSBAG_INSPECTOR_CPP})
include_directories(rs-rosbag-inspector ../../third-party/imgui ../../common ../../third-party)
include_directories(rs-rosbag-inspector ../../third-party/imgui ../../common ../../third-party/glad
../../third-party/tinyfiledialogs ../../third-party)
endif()
set_property(TARGET rs-rosbag-inspector PROPERTY CXX_STANDARD 11)

@@ -14,6 +14,8 @@
#include <regex>
#include <thread>

#include <os.h>

#define GLFW_INCLUDE_GLU
#include <GLFW/glfw3.h>
#include <imgui.h>
@@ -25,8 +27,6 @@
#endif
#endif

#include <os.h>

#include "print_helpers.h"
#include "rosbag_content.h"
#include "files_container.h"

0 comments on commit 22bf509

Please sign in to comment.
You can’t perform that action at this time.