From 1ab017c6d9946be2fd8c02b97f02208c3e3622e7 Mon Sep 17 00:00:00 2001
From: Dave Hershberger <hersh@willowgarage.com>
Date: Tue, 16 Oct 2012 15:47:44 -0700
Subject: [PATCH] Tidied up CMakeLists.txt based on Dirk's recommendations.

---
 CMakeLists.txt | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index def83a4..16d9630 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,21 +2,19 @@ cmake_minimum_required(VERSION 2.8.3)
 project(laser_geometry)
 find_package(catkin REQUIRED sensor_msgs roscpp tf angles)
 catkin_package(
-  LIBRARIES laser_geometry
   INCLUDE_DIRS include
+  LIBRARIES laser_geometry
 )
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
-find_package(Boost 1.40.0 COMPONENTS thread numeric)
-include_directories(${Boost_INCLUDE_DIRS})
+find_package(Boost REQUIRED COMPONENTS thread)
 
 find_package(Eigen REQUIRED)
-include_directories(${EIGEN_INCLUDE_DIRS})
 
-include_directories(include)
+include_directories(include ${Boost_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS})
 
-add_library(laser_geometry src/laser_geometry.cpp )
+add_library(laser_geometry src/laser_geometry.cpp)
 target_link_libraries(laser_geometry ${Boost_LIBRARIES} ${tf_LIBRARIES})
 
 catkin_add_gtest(projection_test test/projection_test.cpp)
@@ -25,6 +23,6 @@ target_link_libraries(projection_test laser_geometry)
 install(TARGETS laser_geometry
   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
-install(DIRECTORY include/
-  DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION}
+install(DIRECTORY include/laser_geometry/
+  DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
   FILES_MATCHING PATTERN "*.h")