From fe0b351db0cc36bcd14f13abcb7d1874ced4e073 Mon Sep 17 00:00:00 2001
From: Atsushi Watanabe <atsushi.w@ieee.org>
Date: Sun, 19 May 2019 12:55:15 +0900
Subject: [PATCH] Fix include directory priority

---
 costmap_cspace/CMakeLists.txt       | 2 +-
 neonavigation_common/CMakeLists.txt | 2 +-
 planner_cspace/CMakeLists.txt       | 2 +-
 track_odometry/CMakeLists.txt       | 2 +-
 trajectory_tracker/CMakeLists.txt   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/costmap_cspace/CMakeLists.txt b/costmap_cspace/CMakeLists.txt
index 60c47b2f..a96994a4 100644
--- a/costmap_cspace/CMakeLists.txt
+++ b/costmap_cspace/CMakeLists.txt
@@ -48,7 +48,7 @@ endif()
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations -DROS_DISTRO_$ENV{ROS_DISTRO}=1")
 
-include_directories(${catkin_INCLUDE_DIRS} include)
+include_directories(include ${catkin_INCLUDE_DIRS})
 
 add_executable(costmap_3d src/costmap_3d.cpp src/costmap_3d_layers.cpp)
 target_link_libraries(costmap_3d ${catkin_LIBRARIES})
diff --git a/neonavigation_common/CMakeLists.txt b/neonavigation_common/CMakeLists.txt
index 54bcb7b2..73868e34 100644
--- a/neonavigation_common/CMakeLists.txt
+++ b/neonavigation_common/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
   message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
 endif()
 
-include_directories(${catkin_INCLUDE_DIRS} include)
+include_directories(include ${catkin_INCLUDE_DIRS})
 
 
 if(CATKIN_ENABLE_TESTING)
diff --git a/planner_cspace/CMakeLists.txt b/planner_cspace/CMakeLists.txt
index c32b208e..95af4ae2 100644
--- a/planner_cspace/CMakeLists.txt
+++ b/planner_cspace/CMakeLists.txt
@@ -66,7 +66,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -funroll-loops -finline-functions ${Open
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg")
 #set(CMAKE_LD_FLAGS "${CMAKE_CXX_FLAGS} -pg")
 
-include_directories(${catkin_INCLUDE_DIRS} include)
+include_directories(include ${catkin_INCLUDE_DIRS})
 
 add_executable(planner_3d
   src/planner_3d.cpp
diff --git a/track_odometry/CMakeLists.txt b/track_odometry/CMakeLists.txt
index fd6a0ca3..c00a8d75 100644
--- a/track_odometry/CMakeLists.txt
+++ b/track_odometry/CMakeLists.txt
@@ -49,7 +49,7 @@ endif()
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
 
-include_directories(${catkin_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR} include)
+include_directories(include ${catkin_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR})
 
 add_executable(track_odometry src/track_odometry.cpp)
 target_link_libraries(track_odometry ${catkin_LIBRARIES})
diff --git a/trajectory_tracker/CMakeLists.txt b/trajectory_tracker/CMakeLists.txt
index 567fe0b5..2f252b5a 100644
--- a/trajectory_tracker/CMakeLists.txt
+++ b/trajectory_tracker/CMakeLists.txt
@@ -37,7 +37,7 @@ catkin_package(
 )
 
 ## Build
-include_directories(${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} include)
+include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
 
 include(CheckCXXCompilerFlag)
 CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)