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

#436) * Revert "Changes the default 3rd party logger from rcl_logging_noop to rcl_logging_log4cxx (#425)" This reverts commit ac8ee90. Signed-off-by: Chris Lalancette <clalancette@openrobotics.org> * Revert "add explicit dependency on rcl_logging_log4cxx (#435)" This reverts commit 816ce67. Signed-off-by: Chris Lalancette <clalancette@openrobotics.org> * Add dependency on rcl_logging_noop. Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
ros2 · May 15, 2019 · 667443b · 667443b
1 parent a77c510
commit 667443b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/rcl/cmake/get_default_rcl_logging_implementation.cmake b/rcl/cmake/get_default_rcl_logging_implementation.cmake
@@ -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

diff --git a/rcl/package.xml b/rcl/package.xml
@@ -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>