From 555ed59077eac99312e706f9b39e681c51200ba3 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Thu, 20 Aug 2020 19:40:52 -0400 Subject: [PATCH 1/2] Ifdef util function implementations if tracing is disabled Signed-off-by: Christophe Bedard --- tracetools/src/utils.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tracetools/src/utils.cpp b/tracetools/src/utils.cpp index 8622476..8b5389e 100644 --- a/tracetools/src/utils.cpp +++ b/tracetools/src/utils.cpp @@ -14,6 +14,8 @@ #include "tracetools/config.h" +#ifndef TRACETOOLS_DISABLED + #ifdef TRACETOOLS_LTTNG_ENABLED #include #include @@ -48,3 +50,5 @@ const char * _get_symbol_funcptr(void * funcptr) return "DISABLED__get_symbol_funcptr"; #endif } + +#endif // TRACETOOLS_DISABLED From c3c16707eb85ba1419694c3e6313f0c41a36e91f Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Thu, 20 Aug 2020 19:41:25 -0400 Subject: [PATCH 2/2] Disable status checking tool by default on Windows Signed-off-by: Christophe Bedard --- tracetools/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tracetools/CMakeLists.txt b/tracetools/CMakeLists.txt index df522cf..0610075 100644 --- a/tracetools/CMakeLists.txt +++ b/tracetools/CMakeLists.txt @@ -16,12 +16,14 @@ find_package(ament_cmake_ros REQUIRED) if(WIN32) set(DISABLED_DEFAULT ON) + set(STATUS_CHECKING_TOOL_DEFAULT OFF) else() set(DISABLED_DEFAULT OFF) + set(STATUS_CHECKING_TOOL_DEFAULT ON) endif() option(TRACETOOLS_DISABLED "Explicitly disable support for tracing" ${DISABLED_DEFAULT}) 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) # Set TRACETOOLS_LTTNG_ENABLED if we can find lttng-ust