Merge pull request #18 from ethz-asl/feature/catkin_simple

Convert to catkin_simple and compile

Author: raghavkhanna

CMakeLists.txt

@@ -1,47 +1,20 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(geodetic_utils)
 
-set(CMAKE_BUILD_TYPE Release)
-
-set(CXXFLAGS ${CXXFLAGS} -fPIC)
-# Linux specific flags
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-	set(CXXFLAGS ${CXXFLAGS} -fPIC)
-	add_definitions(-std=c++0x)
-endif()
-
-find_package(catkin REQUIRED COMPONENTS
-  roslib
-  tf
-  geometry_msgs
-  roscpp
-  sensor_msgs
-  cmake_modules
-)
-
-find_package(Eigen REQUIRED)
-
 add_definitions(-std=c++11)
 
-catkin_package(
-  INCLUDE_DIRS include ${Eigen_INCLUDE_DIRS}
-  CATKIN_DEPENDS geometry_msgs roscpp sensor_msgs geometry_msgs
-  DEPENDS Eigen
-)
-
-include_directories(
-  include
-  ${catkin_INCLUDE_DIRS}
-  ${Eigen_INCLUDE_DIRS}
-)
+find_package(catkin_simple REQUIRED)
+catkin_simple(ALL_DEPS_REQUIRED)
 
+find_package(Eigen REQUIRED)
+include_directories(${Eigen_INCLUDE_DIRS})
 
-add_executable(set_gps_reference_node src/set_gps_reference_node.cpp)
-add_dependencies(set_gps_reference_node ${catkin_EXPORTED_TARGETS})
+cs_add_executable(set_gps_reference_node src/set_gps_reference_node.cpp)
 target_link_libraries(set_gps_reference_node  ${catkin_LIBRARIES})
 
-add_executable(gps_to_pose_conversion_node src/gps_to_pose_conversion_node.cpp)
-add_dependencies(gps_to_pose_conversion_node ${catkin_EXPORTED_TARGETS})
+cs_add_executable(gps_to_pose_conversion_node src/gps_to_pose_conversion_node.cpp)
 target_link_libraries(gps_to_pose_conversion_node  ${catkin_LIBRARIES})
 
-
+cs_install()
+cs_install_scripts(src/gps_spoofer.py src/euler_radians_to_degrees.py src/odometry_height_adjuster.py)
+cs_export()

package.xml

@@ -6,17 +6,20 @@
 
   <author>Enric Galceran</author>
   <author>Marija Popovic</author>
+  <author>Raghav Khanna</author>
 
   <maintainer email="[email protected]">Enric Galceran</maintainer>
   <license>BSD</license>
 
   <buildtool_depend>catkin</buildtool_depend>
   <buildtool_depend>catkin_simple</buildtool_depend>
 
+   <!-- Dependencies. -->
   <depend>roslib</depend>
   <depend>roscpp</depend>
   <depend>tf</depend>
   <depend>sensor_msgs</depend>
-  <depend>geometry_msgs</depend>  
+  <depend>geometry_msgs</depend>
+  <!--cmake_modules dependency required for (find Eigen) command-->
+  <depend>cmake_modules</depend>
 </package>
-