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.

Sign up for GitHub

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

Jump to bottom

Revert "Changes the default 3rd party logger from rcl_logging_noop to… #436

Merged
merged 3 commits into from
May 15, 2019
Merged

Revert "Changes the default 3rd party logger from rcl_logging_noop to… #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
533676d
Revert "Changes the default 3rd party logger from rcl_logging_noop to…
clalancette May 14, 2019
1e86e7f
Revert "add explicit dependency on rcl_logging_log4cxx (#435)"
clalancette May 14, 2019
67224bc
Add dependency on rcl_logging_noop.
clalancette May 14, 2019
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
4 changes: 2 additions & 2 deletions rcl/cmake/get_default_rcl_logging_implementation.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
macro(get_default_rcl_logging_implementation var)

# if logging implementation already specified or RCL_LOGGING_IMPLEMENTATION environment variable
# is set then use that, otherwise default to using rcl_logging_log4cxx
# is set then use that, otherwise default to using rcl_logging_noop
if(NOT "${RCL_LOGGING_IMPLEMENTATION}" STREQUAL "")
set(_logging_implementation "${RCL_LOGGING_IMPLEMENTATION}")
elseif(NOT "$ENV{RCL_LOGGING_IMPLEMENTATION}" STREQUAL "")
set(_logging_implementation "$ENV{RCL_LOGGING_IMPLEMENTATION}")
else()
set(_logging_implementation rcl_logging_log4cxx)
set(_logging_implementation rcl_logging_noop)
endif()

# persist implementation decision in cache
Expand Down
2 changes: 1 addition & 1 deletion rcl/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<exec_depend>rcutils</exec_depend>
<exec_depend>rosidl_default_runtime</exec_depend>

<depend>rcl_logging_log4cxx</depend> <!-- the default logging impl -->
<depend>rcl_logging_noop</depend> <!-- the default logging impl -->
<depend>rmw_implementation</depend>

<test_depend>ament_cmake_gtest</test_depend>
Expand Down