From 94786bbf0c88c2060d4279d548b1befd1b4b49b6 Mon Sep 17 00:00:00 2001
From: Daniel Stonier <d.stonier@gmail.com>
Date: Sun, 1 Mar 2015 13:48:45 +0900
Subject: [PATCH] generate_rosjava_messages cmake api needs the rosjava
 environment.

This makes sure the call to set environment variables occurs when
generating rosjava messages. Does this under the hood so the user
doesn't have to make a second api call to the rosjava catkin api.
---
 CMakeLists.txt                    | 4 ++--
 cmake/genjava-catkin-api.cmake.em | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79be822..6410d12 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,14 +9,14 @@ project(genjava)
 # Find Package
 ##############################################################################
 
-find_package(catkin REQUIRED COMPONENTS genmsg)
+find_package(catkin REQUIRED COMPONENTS genmsg rosjava_build_tools)
 
 ##############################################################################
 # Catkin
 ##############################################################################
 
 catkin_package(
-  CATKIN_DEPENDS genmsg
+  CATKIN_DEPENDS genmsg rosjava_build_tools
   CFG_EXTRAS
     genjava-extras.cmake
     genjava-catkin-api.cmake
diff --git a/cmake/genjava-catkin-api.cmake.em b/cmake/genjava-catkin-api.cmake.em
index fec8705..06d4a5d 100644
--- a/cmake/genjava-catkin-api.cmake.em
+++ b/cmake/genjava-catkin-api.cmake.em
@@ -29,6 +29,7 @@ macro(generate_rosjava_messages)
   if(ARG_UNPARSED_ARGUMENTS)
     message(FATAL_ERROR "generate_rosjava_messages() called with unused arguments: ${ARG_UNPARSED_ARGUMENTS}")
   endif()
+  catkin_rosjava_env_setup()
   set(ROS_GRADLE_VERBOSE $ENV{ROS_GRADLE_VERBOSE})
   if(ROS_GRADLE_VERBOSE)
       set(verbosity "--verbosity")
-- 
GitLab