From 31f4190943ed4a492425ad7f190f1f05547e7e77 Mon Sep 17 00:00:00 2001
From: Dirk Thomas <dthomas@willowgarage.com>
Date: Mon, 4 Mar 2013 17:49:35 -0800
Subject: [PATCH] fix handling spaces in folder names (ros/catkin#375)

---
 cmake/env-hooks/05.catkin-test-results.sh.develspace.in | 2 +-
 cmake/safe_execute_process.cmake                        | 2 +-
 cmake/templates/pkgConfig.cmake.in                      | 3 ++-
 cmake/templates/python_distutils_install.sh.in          | 2 +-
 cmake/templates/setup.sh.in                             | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cmake/env-hooks/05.catkin-test-results.sh.develspace.in b/cmake/env-hooks/05.catkin-test-results.sh.develspace.in
index 6a4df9340..dcbf01865 100644
--- a/cmake/env-hooks/05.catkin-test-results.sh.develspace.in
+++ b/cmake/env-hooks/05.catkin-test-results.sh.develspace.in
@@ -1,4 +1,4 @@
 # generated from catkin/cmake/env-hooks/05.catkin-test-results.sh.develspace.in
 
 export CATKIN_TEST_RESULTS_DIR="@CATKIN_TEST_RESULTS_DIR@"
-export ROS_TEST_RESULTS_DIR=$CATKIN_TEST_RESULTS_DIR
+export ROS_TEST_RESULTS_DIR="$CATKIN_TEST_RESULTS_DIR"
diff --git a/cmake/safe_execute_process.cmake b/cmake/safe_execute_process.cmake
index ab141a6e7..3f6ea9aad 100644
--- a/cmake/safe_execute_process.cmake
+++ b/cmake/safe_execute_process.cmake
@@ -1,7 +1,7 @@
 macro(safe_execute_process cmd_keyword arg1)
   set(_cmd ${arg1})
   foreach(_arg ${ARGN})
-    set(_cmd "${_cmd} ${_arg}")
+    set(_cmd "${_cmd} \"${_arg}\"")
   endforeach()
 
   debug_message(2 "execute_process(${_cmd})")
diff --git a/cmake/templates/pkgConfig.cmake.in b/cmake/templates/pkgConfig.cmake.in
index c8e456fd2..6d660b469 100644
--- a/cmake/templates/pkgConfig.cmake.in
+++ b/cmake/templates/pkgConfig.cmake.in
@@ -165,6 +165,7 @@ if(@PROJECT_NAME@_LIBRARIES)
   _remove_duplicate_libraries(@PROJECT_NAME@_LIBRARIES @PROJECT_NAME@_LIBRARIES)
 endif()
 
-foreach(extra @PKG_CFG_EXTRAS@)
+set(pkg_cfg_extras "@PKG_CFG_EXTRAS@")
+foreach(extra ${pkg_cfg_extras})
   include(${extra})
 endforeach()
diff --git a/cmake/templates/python_distutils_install.sh.in b/cmake/templates/python_distutils_install.sh.in
index fb0aaaf7d..edc3e33c4 100755
--- a/cmake/templates/python_distutils_install.sh.in
+++ b/cmake/templates/python_distutils_install.sh.in
@@ -26,4 +26,4 @@ cd "@INSTALL_CMD_WORKING_DIRECTORY@"
     build --build-base "@CMAKE_CURRENT_BINARY_DIR@" \
     install \
     $DESTDIR_ARG \
-    @SETUPTOOLS_ARG_EXTRA@ --prefix=@CMAKE_INSTALL_PREFIX@ --install-scripts=@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@
+    @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@"
diff --git a/cmake/templates/setup.sh.in b/cmake/templates/setup.sh.in
index fcb3899d8..79aea368c 100644
--- a/cmake/templates/setup.sh.in
+++ b/cmake/templates/setup.sh.in
@@ -45,7 +45,7 @@ if [ $? -ne 0 -o ! -f "$_SETUP_TMP" ]; then
   echo "Could not create temporary file: $_SETUP_TMP"
   return 1
 fi
-CATKIN_SHELL=$CATKIN_SHELL $_SETUP_UTIL $@ > $_SETUP_TMP
+CATKIN_SHELL=$CATKIN_SHELL "$_SETUP_UTIL" $@ > $_SETUP_TMP
 . $_SETUP_TMP
 _RM=`which rm`
 $_RM $_SETUP_TMP