From 71aa2cb0614bd37b0d705c003cc60c24940f804c Mon Sep 17 00:00:00 2001
From: William Woodall <wjwwood@gmail.com>
Date: Tue, 4 Dec 2012 16:03:25 -0800
Subject: [PATCH] Update cmake to pass along console_bridge

Also changed it to depend on console_bridge
like a catkin dependency.
---
 CMakeLists.txt | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5d67a41..627ce1c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,30 +1,29 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(rosconsole_bridge)
 
-find_package(catkin COMPONENTS rosconsole REQUIRED)
-include_directories(${catkin_INCLUDE_DIRS})
+find_package(catkin COMPONENTS rosconsole console_bridge REQUIRED)
+
+include_directories(include ${catkin_INCLUDE_DIRS})
 link_directories(${catkin_LIBRARY_DIRS})
 
 catkin_package(
   LIBRARIES ${PROJECT_NAME}
   INCLUDE_DIRS include
-  )
-
-include_directories(include)
-
-find_package(console_bridge REQUIRED)
-include_directories(${console_bridge_INCLUDE_DIR})
-
-add_library(${PROJECT_NAME}
-  src/bridge.cpp)
+  CATKIN_DEPENDS console_bridge rosconsole
+)
 
-target_link_libraries(${PROJECT_NAME} ${console_bridge_LIBRARIES} ${catkin_LIBRARIES})
+add_library(${PROJECT_NAME} src/bridge.cpp)
 
-install(TARGETS ${PROJECT_NAME}
-        ARCHIVE DESTINATION lib
-        LIBRARY DESTINATION lib)
+target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES})
 
-install(DIRECTORY include/
-        DESTINATION include
-        FILES_MATCHING PATTERN "*.h")
+install(
+  TARGETS ${PROJECT_NAME}
+  ARCHIVE DESTINATION lib
+  LIBRARY DESTINATION lib
+)
 
+install(
+  DIRECTORY include/
+  DESTINATION include
+  FILES_MATCHING PATTERN "*.h"
+)