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

Merge branch '81-testutils-valid_symbol_funcptr-fails' into 'master'

Browse source 
Update tracetools' CMake config to use modern CMake after ament_cmake change

Closes #81

See merge request micro-ROS/ros_tracing/ros2_tracing!162
This commit is contained in:
Christophe Bedard 2020-04-09 14:32:24 -04:00
commit e69c0cd505
1 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
tracetools/CMakeLists.txt
View file

@ -68,14 +68,18 @@ foreach(_header ${HEADERS})
) )
endforeach() endforeach()
# Only use output/binary include directory
include_directories(
${PROJECT_BINARY_DIR}/include
)
add_library(${PROJECT_NAME} ${SOURCES}) add_library(${PROJECT_NAME} ${SOURCES})
if(TRACETOOLS_LTTNG_ENABLED) if(TRACETOOLS_LTTNG_ENABLED)
target_link_libraries(${PROJECT_NAME} ${LTTNG_LIBRARIES}) target_link_libraries(${PROJECT_NAME} ${LTTNG_LIBRARIES})
# Export -rdynamic for downtream packages to use when calling
# ament_target_dependencies()
# which is needed to resolve function addresses to symbols when
# using function pointers directly/without std::bind()
# (the flag should not be used on Windows, but TRACETOOLS_LTTNG_ENABLED
# should never be true on Windows anyway, so there is no need to check)
if(NOT TRACETOOLS_NO_RDYNAMIC)
target_link_libraries(${PROJECT_NAME} "-rdynamic")
endif()
endif() endif()
if(WIN32) if(WIN32)
# Causes the visibility macros to use dllexport rather than dllimport # Causes the visibility macros to use dllexport rather than dllimport
@ -83,6 +87,11 @@ if(WIN32)
target_compile_definitions(${PROJECT_NAME} PRIVATE "TRACETOOLS_BUILDING_DLL") target_compile_definitions(${PROJECT_NAME} PRIVATE "TRACETOOLS_BUILDING_DLL")
endif() endif()
# Only use output/binary include directory
target_include_directories(${PROJECT_NAME} PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>"
"$<INSTALL_INTERFACE:include>"
)
ament_export_interfaces(${PROJECT_NAME}_export HAS_LIBRARY_TARGET) ament_export_interfaces(${PROJECT_NAME}_export HAS_LIBRARY_TARGET)
# Status checking tool # Status checking tool
@ -113,12 +122,7 @@ install(
ament_export_include_directories(include) ament_export_include_directories(include)
if(TRACETOOLS_LTTNG_ENABLED) if(TRACETOOLS_LTTNG_ENABLED)
ament_export_libraries(${PROJECT_NAME} ${LTTNG_LIBRARIES}) ament_export_libraries(${PROJECT_NAME} ${LTTNG_LIBRARIES})
# Export -rdynamic for downtream packages to use when calling # Export -rdynamic for downstream packages using classic CMake variables
# ament_target_dependencies()
# which is needed to resolve function addresses to symbols when
# using function pointers directly/without std::bind()
# (the flag should not be used on Windows, but TRACETOOLS_LTTNG_ENABLED
# should never be true on Windows anyway, so there is no need to check)
if(NOT TRACETOOLS_NO_RDYNAMIC) if(NOT TRACETOOLS_NO_RDYNAMIC)
ament_export_link_flags("-rdynamic") ament_export_link_flags("-rdynamic")
endif() endif()