[ros-genmsg] 01/01: Fix wrong merge

[Jochen Sprickerhof]

This is an automated email from the git hooks/post-receive script.

jspricke-guest pushed a commit to branch master
in repository ros-genmsg.

commit 00536729411a9aeb986e0dab24993d1c7adefcf4
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Mon Nov 23 10:38:57 2015 +0100

    Fix wrong merge
    
    This partly reverts commit d8265033fd9b01d11bd0b6b8a08db79d865a75bc.
---
 cmake/genmsg-extras.cmake.em | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cmake/genmsg-extras.cmake.em b/cmake/genmsg-extras.cmake.em
index c9871b7..ba98807 100644
--- a/cmake/genmsg-extras.cmake.em
+++ b/cmake/genmsg-extras.cmake.em
@@ -20,7 +20,7 @@ include(CMakeParseArguments)
 
 # find message generators in all workspaces
 set(message_generators "")
-foreach(workspace ${CATKIN_WORKSPACES} "/")
+foreach(workspace ${CATKIN_WORKSPACES})
   file(GLOB workspace_message_generators
     RELATIVE ${workspace}/${GENMSG_LANGS_DESTINATION}
     ${workspace}/${GENMSG_LANGS_DESTINATION}/gen*)
@@ -272,7 +272,8 @@ macro(generate_messages)
 
     unset(_dep_msg_paths_file CACHE)
     set(filename "share/${dep}/cmake/${dep}-msg-paths.cmake")
-    find_file(_dep_msg_paths_file ${filename} PATHS ${workspaces})
+    find_file(_dep_msg_paths_file ${filename} PATHS ${workspaces}
+      NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
     if("${_dep_msg_paths_file}" STREQUAL "_dep_msg_paths_file-NOTFOUND")
       message(FATAL_ERROR "Could not find '${filename}' (searched in '${workspaces}').")
     endif()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-genmsg.git