@@ -127,7 +127,7 @@ add_library(
127
127
target_include_directories (${PROJECT_NAME} PUBLIC
128
128
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR} /include>"
129
129
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR} /include>"
130
- "$<INSTALL_INTERFACE:include/ ${PROJECT_NAME} >" )
130
+ "$<INSTALL_INTERFACE:include>" )
131
131
132
132
# Causes the visibility macros to use dllexport rather than dllimport,
133
133
# which is appropriate when building the dll but not consuming it.
@@ -583,29 +583,26 @@ if(BUILD_TESTING)
583
583
add_performance_test (benchmark_logging test /benchmark/benchmark_logging.cpp )
584
584
if (TARGET benchmark_logging )
585
585
target_link_libraries (benchmark_logging ${PROJECT_NAME} )
586
+ target_include_directories (benchmark_logging PUBLIC include )
586
587
endif ()
587
588
588
589
add_performance_test (benchmark_err_handle test /benchmark/benchmark_error_handling.cpp )
589
590
if (TARGET benchmark_err_handle )
590
591
target_link_libraries (benchmark_err_handle ${PROJECT_NAME} )
592
+ target_include_directories (benchmark_err_handle PUBLIC include )
591
593
endif ()
592
594
593
595
if (TARGET test_macros )
594
596
target_link_libraries (test_macros ${PROJECT_NAME} )
595
597
endif ()
596
598
endif ()
597
599
598
- # Export old-style CMake variables
599
- ament_export_include_directories (" include/ ${PROJECT_NAME} " )
600
+ ament_export_dependencies ( ament_cmake )
601
+ ament_export_include_directories (include )
600
602
ament_export_libraries (${PROJECT_NAME} ${CMAKE_DL_LIBS} )
601
-
602
- # Export modern CMake targets
603
603
ament_export_targets (${PROJECT_NAME} )
604
-
605
- ament_export_dependencies (ament_cmake )
606
-
607
604
ament_package ()
608
605
609
606
install (
610
607
DIRECTORY include / ${CMAKE_CURRENT_BINARY_DIR} /include/
611
- DESTINATION include /${PROJECT_NAME} )
608
+ DESTINATION include )
0 commit comments