niklas/rcl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* Revert "Changes the default 3rd party logger from rcl_logging_noop to rcl_logging_log4cxx (#425)"

This reverts commit ac8ee90740.

Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>

* Revert "add explicit dependency on rcl_logging_log4cxx (#435)"

This reverts commit 816ce67893.

Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>

* Add dependency on rcl_logging_noop.

Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
This commit is contained in:
Chris Lalancette 2019-05-15 00:45:26 -04:00 • committed by Dirk Thomas
parent a77c51032d
commit 667443b59c
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rcl/cmake/get_default_rcl_logging_implementation.cmake
View file

@ -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

2
rcl/package.xml
View file

@ -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>