Revert "removed redundant ROSDEPS_ROOT" to ease applying working copy

This reverts commit e487a50.

cmake/catkin_add_env_hooks.cmake

@@ -41,16 +41,7 @@ endfunction()
 
 
 function(catkin_generic_hooks)
-  if(CMAKE_HOST_WIN32)
-    set(CATKIN_PATH_SEPARATOR ";")
-  else()
-    set(CATKIN_PATH_SEPARATOR ":")
-  endif()
-  foreach(path ${CATKIN_ROSDEPS_PATH})
-	file(TO_NATIVE_PATH ${path}/bin _binpath)
-	file(TO_NATIVE_PATH ${path}/lib _libpath)
-	set(CATKIN_ROSDEPS_BINARY_PATH ${CATKIN_ROSDEPS_BINARY_PATH}${CATKIN_PATH_SEPARATOR}${_binpath}${CATKIN_PATH_SEPARATOR}${_libpath})
-  endforeach()
+
   if(MSVC)
     # TODO: windows .bat versions, currently only for buildspace
     configure_file(${catkin_EXTRAS_DIR}/templates/setup.bat.buildspace.in

cmake/templates/env.bat.buildspace.in

@@ -1,19 +1,18 @@
-@echo off
-if "%1"=="" (
+@if "%1"=="" (
   goto EnterBuildEnvironment
 ) else ( 
   goto EnterExecutionEnvironment
 )
 
 :EnterBuildEnvironment
-echo "Entering build environment at @CMAKE_BINARY_DIR@, type 'exit to leave'"
+@echo "Entering build environment at @CMAKE_BINARY_DIR@"
 cmd /K @CMAKE_BINARY_DIR@/setup.bat
-echo "Exiting build environment at @CMAKE_BINARY_DIR@"
-goto End
+@echo "Exiting build environment at @CMAKE_BINARY_DIR@"
+@goto End
 
 :EnterExecutionEnvironment
-call @CMAKE_BINARY_DIR@/setup.bat
-%*
-goto End
+@call @CMAKE_BINARY_DIR@/setup.bat
+@%*
+@goto End
 
 :End

cmake/templates/env.bat.installable.in

@@ -6,7 +6,7 @@ if "%1"=="" (
 )
 
 :EnterBuildEnvironment
-echo "Entering build environment at @CMAKE_INSTALL_PREFIX@, type 'exit' to leave"
+echo "Entering build environment at @CMAKE_INSTALL_PREFIX@"
 cmd /K @CMAKE_INSTALL_PREFIX@/setup.bat
 echo "Exiting build environment at @CMAKE_INSTALL_PREFIX@"
 goto End

cmake/templates/setup.bat.buildspace.in

@@ -1,24 +1,23 @@
-@echo off
-set CATKIN_SHELL=bat
-set PYTHONPATH=@CMAKE_BINARY_DIR@/gen/py;%PYTHONPATH%
-set PATH=@CMAKE_BINARY_DIR@/bin;@catkin_SOURCE_DIR@/bin;%PATH%
-set CATKIN_BINARY_DIR=@CMAKE_BINARY_DIR@
-set CATKIN_SOURCE_DIR=@CMAKE_SOURCE_DIR@
+@set CATKIN_SHELL=bat
+@set PYTHONPATH=@CMAKE_BINARY_DIR@/gen/py;%PYTHONPATH%
+@set PATH=@CMAKE_BINARY_DIR@/bin;@catkin_SOURCE_DIR@/bin;%PATH%
+@set CATKIN_BINARY_DIR=@CMAKE_BINARY_DIR@
+@set CATKIN_SOURCE_DIR=@CMAKE_SOURCE_DIR@
 
-rem We should eventually do catkin's env-hooks properly.
-rem Refer to setup.sh.buildspace.in for example code on how to bring them in.
+@REM We should eventually do catkin's env-hooks properly.
+@REM Refer to setup.sh.buildspace.in for example code on how to bring them in.
 
-rem These should go in a catkin/00.catkin.buildspace.bat.in
+@REM These should go in a catkin/00.catkin.buildspace.bat.in
 
-set CATKIN_ROSDEPS_BINARY_PATH=@CATKIN_ROSDEPS_BINARY_PATH@
-if DEFINED CATKIN_ROSDEPS_BINARY_PATH set PATH=%CATKIN_ROSDEPS_BINARY_PATH%;%PATH%
+@set ROSDEPS_ROOT=@ROSDEPS_ROOT@
+@if DEFINED ROSDEPS_ROOT set PATH=%ROSDEPS_ROOT%/bin;%ROSDEPS_ROOT%/lib;%PATH%
 
-REM These are compatible and should go in build/etc/catkin/profile.d/10.ros.buildspace.all
-REM Actually it would go in 10.ros.buildsspace.bat.in and the .all should get split up
+@REM These are compatible and should go in build/etc/catkin/profile.d/10.ros.buildspace.all
+@REM Actually it would go in 10.ros.buildsspace.bat.in and the .all should get split up
 
-set ROS_TEST_RESULTS_DIR=@CMAKE_BINARY_DIR@/test_results
-set ROS_PACKAGE_PATH=@CMAKE_SOURCE_DIR@
-set ROS_DISTRO=fuerte
-if NOT DEFINED ROS_MASTER_URI (
+@set ROS_TEST_RESULTS_DIR=@CMAKE_BINARY_DIR@/test_results
+@set ROS_PACKAGE_PATH=@CMAKE_SOURCE_DIR@
+@set ROS_DISTRO=fuerte
+@if NOT DEFINED ROS_MASTER_URI (
   set ROS_MASTER_URI=http://localhost:11311
 )

cmake/templates/setup.bat.installable.in

@@ -15,8 +15,8 @@ set CMAKE_PREFIX_PATH=@CMAKE_INSTALL_PREFIX@/share/catkin/cmake/Modules:@CMAKE_I
 
 set PKG_CONFIG_PATH=@CMAKE_INSTALL_PREFIX@/lib/pkgconfig:%PKG_CONFIG_PATH%
 
-set CATKIN_ROSDEPS_BINARY_PATH=@CATKIN_ROSDEPS_BINARY_PATH@
-if DEFINED CATKIN_ROSDEPS_BINARY_PATH set PATH=%CATKIN_ROSDEPS_BINARY_PATH%;%PATH%
+set ROSDEPS_ROOT=@ROSDEPS_ROOT@
+if DEFINED ROSDEPS_ROOT set PATH=%ROSDEPS_ROOT%/bin;%ROSDEPS_ROOT%/lib;%PATH%
 
 REM These are compatible and should go in @CMAKE_INSTALL_PREFIX@/etc/catkin/profile.d/xxx
 REM Namely, 10.ros.all