Merge pull request #225 from personalrobotics/bugfix/manifest.xml

Removed rosbuild support.
personalrobotics · Nov 10, 2015 · baffdcd · baffdcd
2 parents b7a64d4 + 7629335
commit baffdcd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 77 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,19 +1,10 @@
-#
-# Personal Robotics Laboratory
-# Catkin/Rosbuild Switching Template
-#
-# This CMakeLists.txt file is designed to correctly switch two CMakeLists,
-# one for rosbuild and one for catkin.
-#
-# To use this file, create two CMakeLists:
-#   - catkin.cmake : the CMakeLists used in ROS catkin builds
-#   - rosbuild.cmake : the CMakeLists used for ROS rosbuild builds
-#
 cmake_minimum_required(VERSION 2.8.3)
 project(prpy)
-
-if (DEFINED CATKIN_TOPLEVEL OR (NOT ("$ENV{ROS_DISTRO}" STREQUAL "fuerte")))
-    include(${PROJECT_SOURCE_DIR}/catkin.cmake)
-else ()
-    include(${PROJECT_SOURCE_DIR}/rosbuild.cmake)
-endif ()
+
+find_package(catkin REQUIRED)
+catkin_package()
+catkin_python_setup()
+
+if (CATKIN_ENABLE_TESTING)
+  catkin_add_nosetests(tests)
+endif()
diff --git a/catkin.cmake b/catkin.cmake
diff --git a/manifest.xml b/manifest.xml
diff --git a/rosbuild.cmake b/rosbuild.cmake