Skip to content
Snippets Groups Projects
Commit 94786bbf authored by Daniel Stonier's avatar Daniel Stonier
Browse files

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.
parent b40bb20f
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment