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.
rosjava · Mar 1, 2015 · 94786bb · 94786bb
1 parent b40bb20
commit 94786bb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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")