before merge

2019-01-28 14:59:10 +01:00
parent f10e9d3ca7
commit bf217b6ac6
7 changed files with 92 additions and 58 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,10 +22,12 @@ add_service_files(
 generate_messages(DEPENDENCIES std_msgs)
 catkin_package(
    CATKIN_DEPENDS message_runtime
+    INCLUDE_DIRS include
 )

 include_directories(
-  ${catkin_INCLUDE_DIRS}
+    include
+    ${catkin_INCLUDE_DIRS}
 )

 catkin_install_python(PROGRAMS
@@ -39,3 +41,4 @@ catkin_install_python(PROGRAMS
 add_executable(aruco_detector src/aruco_detector.cpp)
 add_executable(speech src/speech.cpp)
 target_link_libraries(aruco_detector ${catkin_LIBRARIES} ${aruco_LIB})
+target_link_libraries(speech ${catkin_LIBRARIES} ${aruco_LIB})