From 69134eaff7597eec2ef030de742912a31e99702a Mon Sep 17 00:00:00 2001
From: Daniel Stonier <d.stonier@gmail.com>
Date: Sun, 1 Mar 2015 13:50:38 +0900
Subject: [PATCH] publically expose the rosjava environment setup (for
genjava).
---
cmake/rosjava.cmake.em | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmake/rosjava.cmake.em b/cmake/rosjava.cmake.em
index b5ac677..b867f5b 100644
--- a/cmake/rosjava.cmake.em
+++ b/cmake/rosjava.cmake.em
@@ -43,7 +43,7 @@ endmacro()
# CATKIN_ENV won't have any configuration, so we need some incoming here.
# Note that we check for the variable existence as well so we don't
# override a user setting.
-macro(_rosjava_env)
+macro(catkin_rosjava_env_setup)
set(ROS_GRADLE_VERBOSE $ENV{ROS_GRADLE_VERBOSE})
set(ROS_MAVEN_DEPLOYMENT_REPOSITORY $ENV{ROS_MAVEN_DEPLOYMENT_REPOSITORY})
set(ROS_MAVEN_REPOSITORY $ENV{ROS_MAVEN_REPOSITORY})
@@ -69,7 +69,7 @@ endmacro()
# Calls the gradle wrapper to compile just the package
# that it is called in with install and installApp targets.
macro(catkin_rosjava_setup)
- _rosjava_env()
+ catkin_rosjava_env_setup()
find_gradle()
if( ${ARGC} EQUAL 0 )
return() # Nothing to do (typically no subprojects created yet)
@@ -123,7 +123,7 @@ endmacro()
# It checks the build type and determines whether it should run
# assembleDebug or assembleRelease
macro(catkin_android_setup)
- _rosjava_env()
+ catkin_rosjava_env_setup()
find_gradle()
if( ${ARGC} EQUAL 0 )
return() # Nothing to do (typically no subprojects created yet)
--
GitLab