Skip to content

Commit

Permalink
use new catkin env hooks
Browse files Browse the repository at this point in the history
  • Loading branch information
Troy Straszheim committed Jan 8, 2012
1 parent 292b1b3 commit 6ccb657
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 5 deletions.
7 changes: 7 additions & 0 deletions 10ecto.buildspace.sh.in
@@ -0,0 +1,7 @@
#
# ecto!
#

/bin/echo "ECTO ENV!"

PYTHONPATH=@CMAKE_LIBRARY_OUTPUT_DIRECTORY@:@ecto_SOURCE_DIR@/python:$PYTHONPATH
3 changes: 3 additions & 0 deletions 10ecto.install.sh.in
@@ -0,0 +1,3 @@
#
# ecto!
#
12 changes: 7 additions & 5 deletions CMakeLists.txt
@@ -1,7 +1,7 @@
#
#
# Copyright (c) 2011, Willow Garage, Inc.
# All rights reserved.
#
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
# * Redistributions of source code must retain the above copyright
Expand All @@ -12,7 +12,7 @@
# * Neither the name of the Willow Garage, Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
Expand All @@ -24,7 +24,7 @@
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
#
cmake_minimum_required(VERSION 2.8)
project(ecto)
find_package(catkin REQUIRED)
Expand Down Expand Up @@ -88,7 +88,9 @@ endif()
catkin_project(ecto
INCLUDE_DIRS
include
${ecto_BINARY_DIR}/include
${ecto_BINARY_DIR}/include
LIBRARIES ecto
CFG_EXTRAS ecto-extras.cmake
)

catkin_add_env_hooks(10ecto.buildspace.sh 10ecto.install.sh)

0 comments on commit 6ccb657

Please sign in to comment.