Skip to content

Commit

Permalink
Revert "Revert "Changes the default 3rd party logger from rcl_logging…
Browse files Browse the repository at this point in the history
…_noop to… (#436)"

This reverts commit 667443b.
  • Loading branch information
mjcarroll committed May 17, 2019
1 parent 2380a1a commit 4b6065c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions rcl/cmake/get_default_rcl_logging_implementation.cmake
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_noop
# is set then use that, otherwise default to using rcl_logging_log4cxx
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_noop)
set(_logging_implementation rcl_logging_log4cxx)
endif()

# persist implementation decision in cache
Expand Down
2 changes: 1 addition & 1 deletion rcl/package.xml
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_noop</depend> <!-- the default logging impl -->
<depend>rcl_logging_log4cxx</depend> <!-- the default logging impl -->
<depend>rmw_implementation</depend>

<test_depend>ament_cmake_gtest</test_depend>
Expand Down

0 comments on commit 4b6065c

Please sign in to comment.