fix handling spaces in folder names (ros/catkin#375)

ros · Mar 5, 2013 · bfd8be2 · bfd8be2
1 parent 2d2dce8
commit bfd8be2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/cmake/genmsg-extras.cmake.em b/cmake/genmsg-extras.cmake.em
@@ -169,10 +169,10 @@ macro(generate_messages)
 
 @[if DEVELSPACE]@
   # cmake dir in develspace
-  set(genmsg_CMAKE_DIR @(CMAKE_CURRENT_SOURCE_DIR)/cmake)
+  set(genmsg_CMAKE_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/cmake")
 @[else]@
   # cmake dir in installspace
-  set(genmsg_CMAKE_DIR @(PKG_CMAKE_DIR))
+  set(genmsg_CMAKE_DIR "@(PKG_CMAKE_DIR)")
 @[end if]@
 
   # ensure that destination variables are initialized

diff --git a/cmake/pkg-genmsg.cmake.em b/cmake/pkg-genmsg.cmake.em
@@ -62,7 +62,7 @@ add_custom_target(@(pkg_name)_generate_messages ALL)
 ### Generating Messages
 @[for m in messages]@
 _generate_msg_@(l[3:])(@pkg_name
-  @m
+  "@m"
   "${MSG_I_FLAGS}"
   "@(';'.join(msg_deps[m]).replace("\\","/"))"
   ${CATKIN_DEVEL_PREFIX}/${@(l)_INSTALL_DIR}/@pkg_name
@@ -72,7 +72,7 @@ _generate_msg_@(l[3:])(@pkg_name
 ### Generating Services
 @[for s in services]@
 _generate_srv_@(l[3:])(@pkg_name
-  @s
+  "@s"
   "${MSG_I_FLAGS}"
   "@(';'.join(srv_deps[s]).replace("\\","/"))"
   ${CATKIN_DEVEL_PREFIX}/${@(l)_INSTALL_DIR}/@pkg_name

diff --git a/cmake/pkg-msg-paths.cmake.in b/cmake/pkg-msg-paths.cmake.in
@@ -1,2 +1,2 @@
-set(@PROJECT_NAME@_MSG_INCLUDE_DIRS @PKG_MSG_INCLUDE_DIRS@)
+set(@PROJECT_NAME@_MSG_INCLUDE_DIRS "@PKG_MSG_INCLUDE_DIRS@")
 set(@PROJECT_NAME@_MSG_DEPENDENCIES @ARG_DEPENDENCIES@)