p36850791
/
kinetic-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removing gtest to rosdep status as talked about in ros meeting today

This commit is contained in:
Tully Foote 2010-04-28 01:24:23 +00:00
parent c72a322119
commit 0f71b63ee5
7 changed files with 7 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
3rdparty/gtest/CMakeLists.txt.bak vendored
View File

@ -1,15 +0,0 @@
# This file is not currently used. It represents a work-in-progress toward
# using CMake to download and build 3rdparty software.
cmake_minimum_required(VERSION 2.4.6)
include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
rospack_wget_and_build(gtest-1.0.1.tar.gz
http://pr.willowgarage.com/downloads/gtest-1.0.1.tar.gz
gtest-1.0.1
"tar xzf"
"./configure --prefix=${CMAKE_SOURCE_DIR}/gtest"
"make"
"make install")
set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_SOURCE_DIR}/gtest)

28
3rdparty/gtest/Makefile vendored
View File

@ -1,28 +0,0 @@
all: gtest
TARBALL = build/gtest-1.4.0.tar.gz
TARBALL_URL = http://pr.willowgarage.com/downloads/gtest-1.4.0.tar.gz
SOURCE_DIR = build/gtest-1.4.0
MD5SUM_FILE = gtest-1.4.0.tar.gz.md5sum
include $(shell rospack find mk)/download_unpack_build.mk
# gtest's death test appears to hang when gtest is compiled with Bullseye's
# gcc wrapper. So, if COVFILE is set (which indicates that we're doing a
# coverage build), then we heuristically modify the PATH to get at the
# real gcc.
ifneq ($(strip $(COVFILE)),)
NEWPATH = /usr/bin:$(PATH)
else
NEWPATH = $(PATH)
endif
gtest: $(SOURCE_DIR)/unpacked
cd $(SOURCE_DIR) && PATH=$(NEWPATH) ./configure --prefix=$(CURDIR)/gtest
cd $(SOURCE_DIR) && PATH=$(NEWPATH) make install
touch gtest
clean:
rm -rf gtest $(SOURCE_DIR)
wipe: clean
rm -rf build

1
3rdparty/gtest/gtest-1.4.0.tar.gz.md5sum vendored
View File

@ -1 +0,0 @@
ec1dd5ab07cde5da033b1d631e621167 gtest-1.4.0.tar.gz

23
3rdparty/gtest/manifest.xml vendored
View File

@ -1,23 +0,0 @@
<package>
<description brief="Googletest unit testing framework for C++">
gtest contains
the <a href="http://code.google.com/p/googletest/">googletest</a>
framework for C++, by Google. gtest is the standard unit test
library for ROS code written in C++, including
<a href="http://www.ros.org/wiki/roscpp">roscpp</a> and, as such,
is included within the ROS distribution. This package wraps version
1.4.0. Our intent is to migrate to OS package manager distributions
as this library becomes more widely available. Until then we will
track the latest stable version which is backwards compatable.
</description>
<author>Google</author>
<license>BSD</license>
<review status="3rdparty doc reviewed" notes="gerkey, 10/2/2009"/>
<url>http://ros.org/wiki/gtest/</url>
<export>
<rosdoc external="http://code.google.com/p/googletest/w/list"/>
</export>
</package>

4
rosdep.yaml
View File

@ -435,3 +435,7 @@ fltk:
epydoc:
ubuntu: python-epydoc
macports: py25-epydoc
gtest:
ubuntu: libgtest-dev
debian: libgtest-dev
macports: google-test

1
test/rostest/manifest.xml
View File

@ -21,5 +21,6 @@
<url>http://ros.org/wiki/rostest</url>
<depend package="roslaunch"/>
<depend package="roslib"/>
<rosdep name="gtest"/>
</package>

4
tools/rosmake/src/rosmake/rosmake.py
View File

@ -694,11 +694,11 @@ class RosMakeAll:
build_passed = True
if building:
#make sure required packages are built before continuing (These are required by internal functions
self.assert_prebuild_built(["tools/rospack", "3rdparty/gtest", "core/genmsg_cpp"])
self.assert_prebuild_built(["tools/rospack", "core/genmsg_cpp"])
self.print_verbose ("Building packages %s"% self.build_list)
build_queue = parallel_build.BuildQueue(self.build_list, self.dependency_tracker, robust_build = options.robust or options.best_effort)
build_queue.register_prebuilt(["rospack", "gtest", "genmsg_cpp"])
build_queue.register_prebuilt(["rospack", "genmsg_cpp"])
build_passed = self.parallel_build_pkgs(build_queue, options.target, threads = options.threads)
if "rospack" in self.build_list and options.target == "clean" and not self.flag_tracker.has_nobuild("rospack"):