remove unnecessary build stuff form CMake

This commit is contained in:
Wim Meeussen 2011-07-01 13:15:57 -07:00
parent 172ee31b57
commit c399f08f55
10 changed files with 15 additions and 22 deletions

View File

@ -14,7 +14,6 @@
<url>http://ros.org/wiki/kdl_parser</url> <url>http://ros.org/wiki/kdl_parser</url>
<depend package="kdl" /> <depend package="kdl" />
<depend package="tinyxml" />
<depend package="urdf" /> <depend package="urdf" />
<depend package="roscpp" /> <depend package="roscpp" />

View File

@ -10,7 +10,6 @@
<review status="Doc reviewed" notes=""/> <review status="Doc reviewed" notes=""/>
<url>http://ros.org/wiki/urdf</url> <url>http://ros.org/wiki/urdf</url>
<depend package="tinyxml" />
<depend package="roscpp" /> <depend package="roscpp" />
<depend package="colladadom" /> <depend package="colladadom" />
<depend package="urdf_parser" /> <depend package="urdf_parser" />

View File

@ -7,21 +7,13 @@ include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
# Release : w/o debug symbols, w/ optimization # Release : w/o debug symbols, w/ optimization
# RelWithDebInfo : w/ debug symbols, w/ optimization # RelWithDebInfo : w/ debug symbols, w/ optimization
# MinSizeRel : w/o debug symbols, w/ optimization, stripped binaries # MinSizeRel : w/o debug symbols, w/ optimization, stripped binaries
set(ROS_BUILD_TYPE Debug) #set(ROS_BUILD_TYPE RelWithDebInfo)
rosbuild_init() #rosbuild_init()
#set the default path for built executables to the "bin" directory #set the default path for built executables to the "bin" directory
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin) #set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
#set the default path for built libraries to the "lib" directory #set the default path for built libraries to the "lib" directory
set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib) #set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
#rosbuild_add_boost_directories()
#uncomment if you have defined messages
#rosbuild_genmsg()
#rosbuild_gensrv()
#common commands for building c++ executables and libraries
#target_link_libraries(${PROJECT_NAME} another_library)
rosbuild_add_boost_directories()
#rosbuild_link_boost(${PROJECT_NAME} thread)

View File

@ -39,7 +39,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <tinyxml/tinyxml.h> #include <tinyxml.h>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include "pose.h" #include "pose.h"

View File

@ -39,7 +39,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <tinyxml/tinyxml.h> #include <tinyxml.h>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include "joint.h" #include "joint.h"

View File

@ -44,7 +44,7 @@
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <tinyxml/tinyxml.h> // FIXME: remove parser from here #include <tinyxml.h> // FIXME: remove parser from here
#include <ros/ros.h> #include <ros/ros.h>
namespace urdf{ namespace urdf{

View File

@ -7,7 +7,9 @@
<license>BSD</license> <license>BSD</license>
<review status="Doc reviewed" notes=""/> <review status="Doc reviewed" notes=""/>
<url>http://ros.org/wiki/urdf_interface</url> <url>http://ros.org/wiki/urdf_interface</url>
<depend package="tinyxml" />
<rosdep name="tinyxml" />
<export> <export>
<cpp cflags="-I${prefix}/include"/> <cpp cflags="-I${prefix}/include"/>
</export> </export>

View File

@ -23,7 +23,7 @@ rosbuild_gensrv()
#common commands for building c++ executables and libraries #common commands for building c++ executables and libraries
rosbuild_add_library(${PROJECT_NAME} src/link.cpp src/joint.cpp src/urdf_parser.cpp) rosbuild_add_library(${PROJECT_NAME} src/link.cpp src/joint.cpp src/urdf_parser.cpp)
#target_link_libraries(${PROJECT_NAME} another_library) target_link_libraries(${PROJECT_NAME} tinyxml)
rosbuild_add_boost_directories() rosbuild_add_boost_directories()
#rosbuild_link_boost(${PROJECT_NAME} thread) #rosbuild_link_boost(${PROJECT_NAME} thread)

View File

@ -39,7 +39,7 @@
#include <string> #include <string>
#include <map> #include <map>
#include <tinyxml/tinyxml.h> #include <tinyxml.h>
#include <boost/function.hpp> #include <boost/function.hpp>
#include <urdf_interface/model.h> #include <urdf_interface/model.h>

View File

@ -12,7 +12,8 @@
<review status="Doc reviewed" notes=""/> <review status="Doc reviewed" notes=""/>
<url>http://ros.org/wiki/urdf_parser</url> <url>http://ros.org/wiki/urdf_parser</url>
<depend package="tinyxml" /> <rosdep name="tinyxml" />
<depend package="roscpp" /> <!-- Only to call ROS_ERROR --> <depend package="roscpp" /> <!-- Only to call ROS_ERROR -->
<depend package="urdf_interface" /> <depend package="urdf_interface" />