Skip to content

Commit 4546892

Browse files
sloretzpablogs9
authored andcommitted
Revert "Install headers to include\${PROJECT_NAME} (ros2#351)"
This reverts commit befc608.
1 parent c1303db commit 4546892

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

CMakeLists.txt

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ add_library(
127127
target_include_directories(${PROJECT_NAME} PUBLIC
128128
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
129129
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>"
130-
"$<INSTALL_INTERFACE:include/${PROJECT_NAME}>")
130+
"$<INSTALL_INTERFACE:include>")
131131

132132
# Causes the visibility macros to use dllexport rather than dllimport,
133133
# which is appropriate when building the dll but not consuming it.
@@ -583,29 +583,26 @@ if(BUILD_TESTING)
583583
add_performance_test(benchmark_logging test/benchmark/benchmark_logging.cpp)
584584
if(TARGET benchmark_logging)
585585
target_link_libraries(benchmark_logging ${PROJECT_NAME})
586+
target_include_directories(benchmark_logging PUBLIC include)
586587
endif()
587588

588589
add_performance_test(benchmark_err_handle test/benchmark/benchmark_error_handling.cpp)
589590
if(TARGET benchmark_err_handle)
590591
target_link_libraries(benchmark_err_handle ${PROJECT_NAME})
592+
target_include_directories(benchmark_err_handle PUBLIC include)
591593
endif()
592594

593595
if(TARGET test_macros)
594596
target_link_libraries(test_macros ${PROJECT_NAME})
595597
endif()
596598
endif()
597599

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)
600602
ament_export_libraries(${PROJECT_NAME} ${CMAKE_DL_LIBS})
601-
602-
# Export modern CMake targets
603603
ament_export_targets(${PROJECT_NAME})
604-
605-
ament_export_dependencies(ament_cmake)
606-
607604
ament_package()
608605

609606
install(
610607
DIRECTORY include/ ${CMAKE_CURRENT_BINARY_DIR}/include/
611-
DESTINATION include/${PROJECT_NAME})
608+
DESTINATION include)

0 commit comments

Comments
 (0)