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

Merge branch '103-fix-windows-build-failure' into 'foxy'

Browse source 
Remove more unnecessary code on Windows & if tracing is disabled

See merge request micro-ROS/ros_tracing/ros2_tracing!197
This commit is contained in:
Ingo Lütkebohle 2020-08-21 08:16:16 +00:00
commit 347e578510
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tracetools/CMakeLists.txt
View file

@ -16,12 +16,14 @@ find_package(ament_cmake_ros REQUIRED)
if(WIN32) if(WIN32)
set(DISABLED_DEFAULT ON) set(DISABLED_DEFAULT ON)
set(STATUS_CHECKING_TOOL_DEFAULT OFF)
else() else()
set(DISABLED_DEFAULT OFF) set(DISABLED_DEFAULT OFF)
set(STATUS_CHECKING_TOOL_DEFAULT ON)
endif() endif()
option(TRACETOOLS_DISABLED "Explicitly disable support for tracing" ${DISABLED_DEFAULT}) option(TRACETOOLS_DISABLED "Explicitly disable support for tracing" ${DISABLED_DEFAULT})
option(TRACETOOLS_NO_RDYNAMIC "Disable export of -rdynamic link flag" OFF) option(TRACETOOLS_NO_RDYNAMIC "Disable export of -rdynamic link flag" OFF)
option(TRACETOOLS_STATUS_CHECKING_TOOL "Enable the status checking tool" ON) option(TRACETOOLS_STATUS_CHECKING_TOOL "Enable the status checking tool" ${STATUS_CHECKING_TOOL_DEFAULT})
if(NOT TRACETOOLS_DISABLED) if(NOT TRACETOOLS_DISABLED)
# Set TRACETOOLS_LTTNG_ENABLED if we can find lttng-ust # Set TRACETOOLS_LTTNG_ENABLED if we can find lttng-ust

4
tracetools/src/utils.cpp
View file

@ -14,6 +14,8 @@
#include "tracetools/config.h" #include "tracetools/config.h"
#ifndef TRACETOOLS_DISABLED
#ifdef TRACETOOLS_LTTNG_ENABLED #ifdef TRACETOOLS_LTTNG_ENABLED
#include <dlfcn.h> #include <dlfcn.h>
#include <cxxabi.h> #include <cxxabi.h>
@ -48,3 +50,5 @@ const char * _get_symbol_funcptr(void * funcptr)
return "DISABLED__get_symbol_funcptr"; return "DISABLED__get_symbol_funcptr";
#endif #endif
} }
#endif // TRACETOOLS_DISABLED