use target include directories (#313)

Signed-off-by: Karsten Knese <[email protected]>
ros-perception · Feb 11, 2020 · a7576d5 · a7576d5
1 parent 312ce6c
commit a7576d5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/cv_bridge/CMakeLists.txt b/cv_bridge/CMakeLists.txt
@@ -45,8 +45,6 @@ find_package(OpenCV 3 REQUIRED
   CONFIG
 )
 
-include_directories(include ${Boost_INCLUDE_DIRS})
-
 if(NOT ANDROID)
   add_subdirectory(python)
 endif()

diff --git a/cv_bridge/src/CMakeLists.txt b/cv_bridge/src/CMakeLists.txt
@@ -2,7 +2,10 @@
 add_library(${PROJECT_NAME} cv_bridge.cpp rgb_colors.cpp)
 include(GenerateExportHeader)
 generate_export_header(${PROJECT_NAME} EXPORT_FILE_NAME ${PROJECT_NAME}/${PROJECT_NAME}_export.h)
-target_include_directories(${PROJECT_NAME} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>")
+target_include_directories(${PROJECT_NAME}
+  PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
+  ${PROJECT_SOURCE_DIR}/include
+  ${BOOST_INCLUDE_DIRS})
 ament_target_dependencies(${PROJECT_NAME}
   "OpenCV"
   "sensor_msgs"
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,8 +45,6 @@ find_package(OpenCV 3 REQUIRED @@
       CONFIG
     )
-    include_directories(include ${Boost_INCLUDE_DIRS})
     if(NOT ANDROID)
       add_subdirectory(python)
     endif()
@@ Expand Down @@