From 47d8609d8b8d733a292df39079d64db6f37585a2 Mon Sep 17 00:00:00 2001
From: Jihoon Lee <jihoonlee.in@gmail.com>
Date: Thu, 22 May 2014 13:31:27 +0900
Subject: [PATCH 1/5] build include path 'include' does not exist

---
 experiments/rocon_unreliable_experiments/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/experiments/rocon_unreliable_experiments/CMakeLists.txt b/experiments/rocon_unreliable_experiments/CMakeLists.txt
index f8156db5..1f297875 100644
--- a/experiments/rocon_unreliable_experiments/CMakeLists.txt
+++ b/experiments/rocon_unreliable_experiments/CMakeLists.txt
@@ -10,7 +10,7 @@ project(rocon_unreliable_experiments)
 ##############################################################################
 
 find_package(catkin REQUIRED COMPONENTS roscpp std_msgs)
-include_directories(SYSTEM include ${catkin_INCLUDE_DIRS})
+include_directories(SYSTEM ${catkin_INCLUDE_DIRS})
 catkin_package(CATKIN_DEPENDS roscpp std_msgs)
 
 ##############################################################################

From 2818bc7d2146cc02802c9bbac6006588c49274f5 Mon Sep 17 00:00:00 2001
From: Jihoon Lee <jihoonlee.in@gmail.com>
Date: Thu, 22 May 2014 13:35:02 +0900
Subject: [PATCH 2/5] unconfigured build_depend on 'rostest

---
 rocon_test/package.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/rocon_test/package.xml b/rocon_test/package.xml
index ed51367e..1a80fe18 100644
--- a/rocon_test/package.xml
+++ b/rocon_test/package.xml
@@ -13,8 +13,6 @@
 
   <buildtool_depend>catkin</buildtool_depend>
 
-  <build_depend>rostest</build_depend>
-
   <run_depend>rospy</run_depend>
   <run_depend>rostest</run_depend>
   <run_depend>rosunit</run_depend>
@@ -22,4 +20,4 @@
   <run_depend>rocon_python_utils</run_depend>
   <run_depend>roslaunch</run_depend>
   <run_depend>rocon_launch</run_depend>
-</package>
\ No newline at end of file
+</package>

From 530a5076601a6f29ca0dde33f3273821410ec91b Mon Sep 17 00:00:00 2001
From: Jihoon Lee <jihoonlee.in@gmail.com>
Date: Thu, 22 May 2014 13:51:02 +0900
Subject: [PATCH 3/5] rocon_gateway_utils missing COMPONENTS keyword before
 'rosunit rostest

---
 rocon_gateway_utils/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rocon_gateway_utils/CMakeLists.txt b/rocon_gateway_utils/CMakeLists.txt
index 7e2c7c30..5328cb78 100644
--- a/rocon_gateway_utils/CMakeLists.txt
+++ b/rocon_gateway_utils/CMakeLists.txt
@@ -19,7 +19,7 @@ catkin_python_setup()
 ##############################################################################
 
 if (CATKIN_ENABLE_TESTING)
-  find_package(catkin REQUIRED rosunit rostest)
+  find_package(catkin REQUIRED COMPONENTS rosunit rostest)
   add_subdirectory(tests)
 endif()
 

From cbd3613adcf4ce81b856267aa112a29939f5fb5e Mon Sep 17 00:00:00 2001
From: Jihoon Lee <jihoonlee.in@gmail.com>
Date: Thu, 22 May 2014 13:53:22 +0900
Subject: [PATCH 4/5] rocon_gateway_tests: CMakeLists.txt(12): error: missing
 COMPONENTS keyword before 'rocon_test'

---
 rocon_gateway_tests/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rocon_gateway_tests/CMakeLists.txt b/rocon_gateway_tests/CMakeLists.txt
index ea66337b..aa13cc20 100644
--- a/rocon_gateway_tests/CMakeLists.txt
+++ b/rocon_gateway_tests/CMakeLists.txt
@@ -9,7 +9,7 @@ project(rocon_gateway_tests)
 # Catkin
 ##############################################################################
 
-find_package(catkin REQUIRED rocon_test)
+find_package(catkin REQUIRED COMPONENTS rocon_test)
 catkin_package()
 
 catkin_python_setup()

From 4078977cb6ad7c582be707ef15eabe3f8f3915b3 Mon Sep 17 00:00:00 2001
From: Jihoon Lee <jihoonlee.in@gmail.com>
Date: Mon, 26 May 2014 14:48:29 +0900
Subject: [PATCH 5/5] adding back the rostest in rocon_test

---
 rocon_test/package.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rocon_test/package.xml b/rocon_test/package.xml
index 1a80fe18..1a3bece5 100644
--- a/rocon_test/package.xml
+++ b/rocon_test/package.xml
@@ -12,6 +12,7 @@
   <author>Daniel Stonier</author>
 
   <buildtool_depend>catkin</buildtool_depend>
+  <build_depend>rostest</build_depend>
 
   <run_depend>rospy</run_depend>
   <run_depend>rostest</run_depend>