[Personalrobots-commit] SF.net SVN: personalrobots:[9636] pkg/trunk

[<ge...@us...>]

Revision: 9636
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=9636&view=rev
Author:   gerkey
Date:     2009-01-17 18:58:25 +0000 (Sat, 17 Jan 2009)

Log Message:
-----------
converted to cmake

Modified Paths:
--------------
    pkg/trunk/drivers/input/joy_view/Makefile
    pkg/trunk/util/sdlgl/Makefile

Added Paths:
-----------
    pkg/trunk/drivers/input/joy_view/CMakeLists.txt
    pkg/trunk/util/sdlgl/CMakeLists.txt

Removed Paths:
-------------
    pkg/trunk/drivers/input/joy_view/ROS_BUILD_BLACKLIST
    pkg/trunk/util/sdlgl/src/Makefile

Added: pkg/trunk/drivers/input/joy_view/CMakeLists.txt
===================================================================
--- pkg/trunk/drivers/input/joy_view/CMakeLists.txt	                        (rev 0)
+++ pkg/trunk/drivers/input/joy_view/CMakeLists.txt	2009-01-17 18:58:25 UTC (rev 9636)
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 2.4.6)
+
+include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
+rospack(joy_view)
+rospack_add_executable(joy_view joy_view.cpp)

Modified: pkg/trunk/drivers/input/joy_view/Makefile
===================================================================
--- pkg/trunk/drivers/input/joy_view/Makefile	2009-01-17 18:57:47 UTC (rev 9635)
+++ pkg/trunk/drivers/input/joy_view/Makefile	2009-01-17 18:58:25 UTC (rev 9636)
@@ -1,4 +1,5 @@
-SRC = joy_view.cpp 
-OUT = joy_view
-PKG = joy_view
-include $(shell rospack find mk)/node.mk
+include $(shell rospack find mk)/cmake.mk
+#SRC = joy_view.cpp 
+#OUT = joy_view
+#PKG = joy_view
+#include $(shell rospack find mk)/node.mk

Deleted: pkg/trunk/drivers/input/joy_view/ROS_BUILD_BLACKLIST
===================================================================
--- pkg/trunk/drivers/input/joy_view/ROS_BUILD_BLACKLIST	2009-01-17 18:57:47 UTC (rev 9635)
+++ pkg/trunk/drivers/input/joy_view/ROS_BUILD_BLACKLIST	2009-01-17 18:58:25 UTC (rev 9636)
@@ -1 +0,0 @@
-Blacklisting until we move it to cmake.

Added: pkg/trunk/util/sdlgl/CMakeLists.txt
===================================================================
--- pkg/trunk/util/sdlgl/CMakeLists.txt	                        (rev 0)
+++ pkg/trunk/util/sdlgl/CMakeLists.txt	2009-01-17 18:58:25 UTC (rev 9636)
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 2.4.6)
+include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
+find_package(SDL REQUIRED)
+rospack(sdlgl)
+include_directories(${SDL_INCLUDE_DIR})
+rospack_add_library(sdlgl src/sdlgl.cpp)
+target_link_libraries(sdlgl ${SDL_LIBRARY})

Modified: pkg/trunk/util/sdlgl/Makefile
===================================================================
--- pkg/trunk/util/sdlgl/Makefile	2009-01-17 18:57:47 UTC (rev 9635)
+++ pkg/trunk/util/sdlgl/Makefile	2009-01-17 18:58:25 UTC (rev 9636)
@@ -1,2 +1,3 @@
-SUBDIRS = src
-include $(shell rospack find mk)/recurse_subdirs.mk
+include $(shell rospack find mk)/cmake.mk
+#SUBDIRS = src
+#include $(shell rospack find mk)/recurse_subdirs.mk

Deleted: pkg/trunk/util/sdlgl/src/Makefile
===================================================================
--- pkg/trunk/util/sdlgl/src/Makefile	2009-01-17 18:57:47 UTC (rev 9635)
+++ pkg/trunk/util/sdlgl/src/Makefile	2009-01-17 18:58:25 UTC (rev 9636)
@@ -1,7 +0,0 @@
-SRC = sdlgl.cpp
-OUT = ../lib/libsdlgl.a 
-PKG = sdlgl
-CFLAGS = `sdl-config --cflags`
-LFLAGS = `sdl-config --libs`
-include $(shell rospack find mk)/lib.mk
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.