Install headers to include/${PROJECT_NAME}

Signed-off-by: Shane Loretz <[email protected]>

Author: sloretz

tracetools/CMakeLists.txt

@@ -85,12 +85,12 @@ if(NOT TRACETOOLS_DISABLED)
   # Only use output/binary include directory
   target_include_directories(${PROJECT_NAME} PUBLIC
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>"
-    "$<INSTALL_INTERFACE:include>"
+    "$<INSTALL_INTERFACE:include/${PROJECT_NAME}>"
   )
 else()
   target_include_directories(${PROJECT_NAME} INTERFACE
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>"
-    "$<INSTALL_INTERFACE:include>"
+    "$<INSTALL_INTERFACE:include/${PROJECT_NAME}>"
   )
 endif()
 
@@ -140,18 +140,19 @@ endforeach()
 
 install(
   DIRECTORY ${PROJECT_BINARY_DIR}/include/
-  DESTINATION include
+  DESTINATION include/${PROJECT_NAME}
 )
 install(
   TARGETS ${PROJECT_NAME}
   EXPORT ${PROJECT_NAME}_export
   LIBRARY DESTINATION lib
   ARCHIVE DESTINATION lib
   RUNTIME DESTINATION bin
-  INCLUDES DESTINATION include
 )
 
-ament_export_include_directories(include)
+# Export old-style CMake variables
+ament_export_include_directories("include/${PROJECT_NAME}")
+
 if(TRACETOOLS_LTTNG_ENABLED)
   ament_export_libraries(${PROJECT_NAME} ${LTTNG_LIBRARIES})
   # Export -rdynamic for downstream packages using classic CMake variables