Skip to content
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.

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

Make cuckoo_time_translator depend on rosconsole_bridge #26

Merged
merged 2 commits into from
Jul 13, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions cuckoo_time_translator/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ endif ()

cs_add_library(${PROJECT_NAME}
src/DeviceTimeTranslator.cpp
src/RosConsoleBridgeActivator.cpp
)

cs_add_executable(mock_cuckoo_device_driver
Expand Down
1 change: 1 addition & 0 deletions cuckoo_time_translator/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<exec_depend>message_runtime</exec_depend>

<depend>cuckoo_time_translator_algorithms</depend>
<depend>rosconsole_bridge</depend>

<test_depend>rostest</test_depend>
</package>
4 changes: 2 additions & 2 deletions cuckoo_time_translator/src/MockCuckooDeviceDriver.cpp
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#include "MockCuckooDeviceDriver.h"

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#include "ros/ros.h"
#include "std_msgs/String.h"
#pragma GCC diagnostic pop

#include "MockCuckooDeviceDriver.h"

namespace cuckoo_time_translator {
constexpr uint32_t MockCuckooDeviceDriver::kWrappingNumber;
constexpr double MockCuckooDeviceDriver::kFreq;
Expand Down
3 changes: 3 additions & 0 deletions cuckoo_time_translator/src/RosConsoleBridgeActivator.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#include <rosconsole_bridge/bridge.h>

REGISTER_ROSCONSOLE_BRIDGE;
1 change: 1 addition & 0 deletions cuckoo_time_translator_algorithms/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

<build_depend>roscpp</build_depend>
<depend>cmake_modules</depend>
<depend>rosconsole_bridge</depend>

<test_depend>gtest</test_depend>
</package>