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

updated variables to latest catkin

This commit is contained in:
Dirk Thomas 2012-11-06 04:58:56 +00:00
parent 07f3b44e29
commit 25d1efa9f5
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/roslib/cmake/roslib-extras.cmake.em
View File

@ -1,7 +1,7 @@
# generated from ros/core/roslib/cmake/roslib-extras.cmake.em # generated from ros/core/roslib/cmake/roslib-extras.cmake.em
@[if BUILDSPACE]@ @[if DEVELSPACE]@
# set path to gendeps executable in buildspace # set path to gendeps executable in develspace
set(gendeps_exe @(CMAKE_CURRENT_SOURCE_DIR)/scripts/gendeps) set(gendeps_exe @(CMAKE_CURRENT_SOURCE_DIR)/scripts/gendeps)
@[else]@ @[else]@
# set path to gendeps executable in installspace # set path to gendeps executable in installspace

6
core/roslib/env-hooks/10.ros.bat.em
View File

@ -21,11 +21,11 @@ setlocal EnableDelayedExpansion
set ROS_PACKAGE_PATH_PARENTS= set ROS_PACKAGE_PATH_PARENTS=
for /f %%a in ('python _parent_package_path.py') do set ROS_PACKAGE_PATH_PARENTS=!ROS_PACKAGE_PATH_PARENTS!%%a for /f %%a in ('python _parent_package_path.py') do set ROS_PACKAGE_PATH_PARENTS=!ROS_PACKAGE_PATH_PARENTS!%%a
@[if BUILDSPACE]@ @[if DEVELSPACE]@
REM env variables in buildspace REM env variables in develspace
set ROS_PACKAGE_PATH=@(CMAKE_SOURCE_DIR)$ROS_PACKAGE_PATH_PARENTS set ROS_PACKAGE_PATH=@(CMAKE_SOURCE_DIR)$ROS_PACKAGE_PATH_PARENTS
set ROS_ROOT=@(CMAKE_CURRENT_SOURCE_DIR) set ROS_ROOT=@(CMAKE_CURRENT_SOURCE_DIR)
set ROS_ETC_DIR=@(CATKIN_BUILD_PREFIX)/@(CATKIN_PACKAGE_ETC_DESTINATION) set ROS_ETC_DIR=@(CATKIN_DEVEL_PREFIX)/@(CATKIN_PACKAGE_ETC_DESTINATION)
@[else]@ @[else]@
REM env variables in installspace REM env variables in installspace
set ROS_PACKAGE_PATH=@(CMAKE_INSTALL_PREFIX)/share:@(CMAKE_INSTALL_PREFIX)/stacks$ROS_PACKAGE_PATH_PARENTS set ROS_PACKAGE_PATH=@(CMAKE_INSTALL_PREFIX)/share:@(CMAKE_INSTALL_PREFIX)/stacks$ROS_PACKAGE_PATH_PARENTS

10
core/roslib/env-hooks/10.ros.sh.em
View File

@ -11,10 +11,10 @@ from __future__ import print_function
import os import os
env_name = 'CMAKE_PREFIX_PATH' env_name = 'CMAKE_PREFIX_PATH'
paths = [path for path in os.environ[env_name].split(os.pathsep)] if env_name in os.environ and os.environ[env_name] != '' else [] paths = [path for path in os.environ[env_name].split(os.pathsep)] if env_name in os.environ and os.environ[env_name] != '' else []
workspaces = [path for path in paths if os.path.exists(os.path.join(path, '.CATKIN_WORKSPACE'))] workspaces = [path for path in paths if os.path.exists(os.path.join(path, '.catkin'))]
paths = [] paths = []
for workspace in workspaces: for workspace in workspaces:
filename = os.path.join(workspace, '.CATKIN_WORKSPACE') filename = os.path.join(workspace, '.catkin')
data = '' data = ''
with open(filename) as f: with open(filename) as f:
data = f.read() data = f.read()
@ -29,10 +29,10 @@ EOF
) )
export ROS_PACKAGE_PATH=`python -c "$PYTHON_CODE_BUILD_ROS_PACKAGE_PATH"` export ROS_PACKAGE_PATH=`python -c "$PYTHON_CODE_BUILD_ROS_PACKAGE_PATH"`
@[if BUILDSPACE]@ @[if DEVELSPACE]@
# env variables in buildspace # env variables in develspace
export ROS_ROOT=@(CMAKE_CURRENT_SOURCE_DIR)/../.. export ROS_ROOT=@(CMAKE_CURRENT_SOURCE_DIR)/../..
export ROS_ETC_DIR=@(CATKIN_BUILD_PREFIX)/@(CATKIN_GLOBAL_ETC_DESTINATION)/ros export ROS_ETC_DIR=@(CATKIN_DEVEL_PREFIX)/@(CATKIN_GLOBAL_ETC_DESTINATION)/ros
@[else]@ @[else]@
# env variables in installspace # env variables in installspace
export ROS_ROOT=@(CMAKE_INSTALL_PREFIX)/@(CATKIN_GLOBAL_SHARE_DESTINATION)/ros export ROS_ROOT=@(CMAKE_INSTALL_PREFIX)/@(CATKIN_GLOBAL_SHARE_DESTINATION)/ros

2
tools/rosbash/CMakeLists.txt
View File

@ -11,7 +11,7 @@ install(PROGRAMS scripts/rosrun
# making toplevel forward script for bash script rosrun # making toplevel forward script for bash script rosrun
set(BASH_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/scripts/rosrun) set(BASH_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/scripts/rosrun)
configure_file(${catkin_EXTRAS_DIR}/templates/script.bash.in configure_file(${catkin_EXTRAS_DIR}/templates/script.bash.in
${CATKIN_BUILD_PREFIX}/bin/rosrun ${CATKIN_DEVEL_PREFIX}/bin/rosrun
@ONLY) @ONLY)
catkin_add_env_hooks(15.rosbash SHELLS bash tcsh zsh DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/env-hooks) catkin_add_env_hooks(15.rosbash SHELLS bash tcsh zsh DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/env-hooks)

2
tools/rosbash/env-hooks/15.rosbash.bash.em
View File

@ -1,6 +1,6 @@
# generated from rosbash/env-hooks/15.rosbash.bash.em # generated from rosbash/env-hooks/15.rosbash.bash.em
@[if BUILDSPACE]@ @[if DEVELSPACE]@
. @(CMAKE_CURRENT_SOURCE_DIR)/rosbash . @(CMAKE_CURRENT_SOURCE_DIR)/rosbash
@[else]@ @[else]@
. @(CMAKE_INSTALL_PREFIX)/share/rosbash/rosbash . @(CMAKE_INSTALL_PREFIX)/share/rosbash/rosbash

2
tools/rosbash/env-hooks/15.rosbash.tcsh.em
View File

@ -1,6 +1,6 @@
# generated from rosbash/env-hooks/15.rosbash.tcsh.em # generated from rosbash/env-hooks/15.rosbash.tcsh.em
@[if BUILDSPACE]@ @[if DEVELSPACE]@
. @(CMAKE_CURRENT_SOURCE_DIR)/rostcsh . @(CMAKE_CURRENT_SOURCE_DIR)/rostcsh
@[else]@ @[else]@
. @(CMAKE_INSTALL_PREFIX)/share/rosbash/rostcsh . @(CMAKE_INSTALL_PREFIX)/share/rosbash/rostcsh

2
tools/rosbash/env-hooks/15.rosbash.zsh.em
View File

@ -1,6 +1,6 @@
# generated from rosbash/env-hooks/15.rosbash.zsh.em # generated from rosbash/env-hooks/15.rosbash.zsh.em
@[if BUILDSPACE]@ @[if DEVELSPACE]@
. @(CMAKE_CURRENT_SOURCE_DIR)/roszsh . @(CMAKE_CURRENT_SOURCE_DIR)/roszsh
@[else]@ @[else]@
. @(CMAKE_INSTALL_PREFIX)/share/rosbash/roszsh . @(CMAKE_INSTALL_PREFIX)/share/rosbash/roszsh

4
tools/rosunit/cmake/rosunit-extras.cmake.em
View File

@ -1,8 +1,8 @@
include(CMakeParseArguments) include(CMakeParseArguments)
macro(rosunit_initialize_tests) macro(rosunit_initialize_tests)
@[if BUILDSPACE]@ @[if DEVELSPACE]@
# find program in buildspace # find program in develspace
find_program_required(ROSUNIT_EXE rosunit find_program_required(ROSUNIT_EXE rosunit
PATHS @(PROJECT_SOURCE_DIR)/scripts PATHS @(PROJECT_SOURCE_DIR)/scripts
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)