diff --git a/tracetools/CMakeLists.txt b/tracetools/CMakeLists.txt
index 917b923..fa83f21 100644
--- a/tracetools/CMakeLists.txt
+++ b/tracetools/CMakeLists.txt
@@ -12,15 +12,14 @@ endif()
 
 find_package(ament_cmake_ros REQUIRED)
 
-option(WITH_LTTNG "Enable support for tracing with LTTng" ON)
-if(WITH_LTTNG)
-  # Set TRACING_ENABLED if we can find lttng-ust
-  # TODO: Should these be quiet?
+option(TRACETOOLS_DISABLED "Explicitly disable support for tracing with LTTng" OFF)
+if(NOT TRACETOOLS_DISABLED)
   find_package(PkgConfig)
   if(PkgConfig_FOUND)
     pkg_check_modules(LTTNG lttng-ust)
     if(LTTNG_FOUND)
       set(TRACING_ENABLED TRUE)
+      message("LTTng found: tracing enabled")
     endif()
   endif()
 endif()
@@ -52,8 +51,8 @@ set(SOURCES
 if(TRACING_ENABLED)
   list(APPEND SOURCES
     include/tracetools/tp_call.h
-    src/tp_call.c)
-
+    src/tp_call.c
+  )
 endif()
 
 add_library(${PROJECT_NAME} SHARED ${SOURCES})
diff --git a/tracetools_test/CMakeLists.txt b/tracetools_test/CMakeLists.txt
index abfb684..182d27d 100644
--- a/tracetools_test/CMakeLists.txt
+++ b/tracetools_test/CMakeLists.txt
@@ -12,10 +12,8 @@ endif()
 
 find_package(ament_cmake REQUIRED)
 
-option(WITH_LTTNG "Enable support for tracing with LTTng" ON)
-if(WITH_LTTNG)
-  # Set TRACING_ENABLED if we can find lttng-ust
-  # TODO should these be quiet?
+option(TRACETOOLS_DISABLED "Explicitly disable support for tracing with LTTng" OFF)
+if(NOT TRACETOOLS_DISABLED)
   find_package(PkgConfig)
   if(PkgConfig_FOUND)
     pkg_check_modules(LTTNG lttng-ust)