From bfd8be2577b0c4746e58fe55395cfcfa032aea2d Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Mon, 4 Mar 2013 16:12:04 -0800 Subject: [PATCH] fix handling spaces in folder names (ros/catkin#375) --- cmake/genmsg-extras.cmake.em | 4 ++-- cmake/pkg-genmsg.cmake.em | 4 ++-- cmake/pkg-msg-paths.cmake.in | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/genmsg-extras.cmake.em b/cmake/genmsg-extras.cmake.em index 8ba2b24..8c56482 100644 --- 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 index ed75a12..274c7fa 100644 --- 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 index f85aaf0..c40966c 100644 --- 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@)