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

Merge branch '103-fix-windows-build-failure-2nd-try' into 'foxy'

Browse source 
Do not export tracetools if empty

See merge request micro-ROS/ros_tracing/ros2_tracing!200
This commit is contained in:
Ingo Lütkebohle 2020-09-09 14:16:16 +00:00
commit d11b877372
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tracetools/CMakeLists.txt
View file

@ -95,7 +95,9 @@ target_include_directories(${PROJECT_NAME} PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>"
"$<INSTALL_INTERFACE:include>" "$<INSTALL_INTERFACE:include>"
) )
if(NOT TRACETOOLS_DISABLED)
ament_export_targets(${PROJECT_NAME}_export HAS_LIBRARY_TARGET) ament_export_targets(${PROJECT_NAME}_export HAS_LIBRARY_TARGET)
endif()
if(TRACETOOLS_STATUS_CHECKING_TOOL) if(TRACETOOLS_STATUS_CHECKING_TOOL)
# Status checking tool # Status checking tool
@ -131,7 +133,7 @@ if(TRACETOOLS_LTTNG_ENABLED)
if(NOT TRACETOOLS_NO_RDYNAMIC) if(NOT TRACETOOLS_NO_RDYNAMIC)
ament_export_link_flags("-rdynamic") ament_export_link_flags("-rdynamic")
endif() endif()
else() elseif(NOT TRACETOOLS_DISABLED)
ament_export_libraries(${PROJECT_NAME}) ament_export_libraries(${PROJECT_NAME})
endif() endif()