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

refactored env hooks and extra files from 'in' to 'em'

This commit is contained in:
Dirk Thomas 2012-11-04 04:20:54 +00:00
parent b799ce68c7
commit 0092abbba3
9 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/roslib/cmake/roslib-extras.cmake.em Normal file
View File

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

8
core/roslib/cmake/roslib-extras.cmake.in
View File

@ -1,8 +0,0 @@
# generated from ros/core/roslib/cmake/roslib-extras.cmake.in
# set path to gendeps executable
if (@BUILDSPACE@)
set(gendeps_exe @CMAKE_CURRENT_SOURCE_DIR@/scripts/gendeps)
else()
set(gendeps_exe @CMAKE_INSTALL_PREFIX@/lib/roslib/gendeps)
endif()

7
tools/rosbash/env-hooks/15.rosbash.bash.em Normal file
View File

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

6
tools/rosbash/env-hooks/15.rosbash.bash.in
View File

@ -1,6 +0,0 @@
if @BUILDSPACE@; then
. @CMAKE_CURRENT_SOURCE_DIR@/rosbash
fi
if @INSTALLSPACE@; then
. @CMAKE_INSTALL_PREFIX@/share/rosbash/rosbash
fi

7
tools/rosbash/env-hooks/15.rosbash.tcsh.em Normal file
View File

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

6
tools/rosbash/env-hooks/15.rosbash.tcsh.in
View File

@ -1,6 +0,0 @@
if @BUILDSPACE@; then
. @CMAKE_CURRENT_SOURCE_DIR@/rostcsh
fi
if @INSTALLSPACE@; then
. @CMAKE_INSTALL_PREFIX@/share/rosbash/rostcsh
fi

7
tools/rosbash/env-hooks/15.rosbash.zsh.em Normal file
View File

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

6
tools/rosbash/env-hooks/15.rosbash.zsh.in
View File

@ -1,6 +0,0 @@
if @BUILDSPACE@; then
. @CMAKE_CURRENT_SOURCE_DIR@/roszsh
fi
if @INSTALLSPACE@; then
. @CMAKE_INSTALL_PREFIX@/share/rosbash/roszsh
fi

22
tools/rosunit/cmake/rosunit-extras.cmake.in → tools/rosunit/cmake/rosunit-extras.cmake.em
View File

@ -1,22 +1,24 @@
include(CMakeParseArguments)
macro(rosunit_initialize_tests)
if (@BUILDSPACE@)
find_program_required(ROSUNIT_EXE rosunit
PATHS @PROJECT_SOURCE_DIR@/scripts
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
else()
find_program_required(ROSUNIT_EXE rosunit
PATHS @CMAKE_INSTALL_PREFIX@/bin
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
endif()
@[if BUILDSPACE]@
# find program in buildspace
find_program_required(ROSUNIT_EXE rosunit
PATHS @(PROJECT_SOURCE_DIR)/scripts
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
@[else]@
# find program in installspace
find_program_required(ROSUNIT_EXE rosunit
PATHS @(CMAKE_INSTALL_PREFIX)/bin
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
@[end if]@
endmacro()
rosunit_initialize_tests()
function(add_pyunit file)
message(WARNING "add_pyunit() is deprecated. For Python tests, use add_nostests() instead.")
message(WARNING "add_pyunit() is deprecated. For Python tests, use catkin_add_nosetests() instead.")
# Look for optional TIMEOUT argument, #2645
cmake_parse_arguments(_pyunit "" "TIMEOUT;WORKING_DIRECTORY" "" ${ARGN})