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

publically expose the rosjava environment setup (for genjava).

parent d7ec3f90
No related branches found
No related tags found
No related merge requests found
...@@ -43,7 +43,7 @@ endmacro() ...@@ -43,7 +43,7 @@ endmacro()
# CATKIN_ENV won't have any configuration, so we need some incoming here. # 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 # Note that we check for the variable existence as well so we don't
# override a user setting. # override a user setting.
macro(_rosjava_env) macro(catkin_rosjava_env_setup)
set(ROS_GRADLE_VERBOSE $ENV{ROS_GRADLE_VERBOSE}) set(ROS_GRADLE_VERBOSE $ENV{ROS_GRADLE_VERBOSE})
set(ROS_MAVEN_DEPLOYMENT_REPOSITORY $ENV{ROS_MAVEN_DEPLOYMENT_REPOSITORY}) set(ROS_MAVEN_DEPLOYMENT_REPOSITORY $ENV{ROS_MAVEN_DEPLOYMENT_REPOSITORY})
set(ROS_MAVEN_REPOSITORY $ENV{ROS_MAVEN_REPOSITORY}) set(ROS_MAVEN_REPOSITORY $ENV{ROS_MAVEN_REPOSITORY})
...@@ -69,7 +69,7 @@ endmacro() ...@@ -69,7 +69,7 @@ endmacro()
# Calls the gradle wrapper to compile just the package # Calls the gradle wrapper to compile just the package
# that it is called in with install and installApp targets. # that it is called in with install and installApp targets.
macro(catkin_rosjava_setup) macro(catkin_rosjava_setup)
_rosjava_env() catkin_rosjava_env_setup()
find_gradle() find_gradle()
if( ${ARGC} EQUAL 0 ) if( ${ARGC} EQUAL 0 )
return() # Nothing to do (typically no subprojects created yet) return() # Nothing to do (typically no subprojects created yet)
...@@ -123,7 +123,7 @@ endmacro() ...@@ -123,7 +123,7 @@ endmacro()
# It checks the build type and determines whether it should run # It checks the build type and determines whether it should run
# assembleDebug or assembleRelease # assembleDebug or assembleRelease
macro(catkin_android_setup) macro(catkin_android_setup)
_rosjava_env() catkin_rosjava_env_setup()
find_gradle() find_gradle()
if( ${ARGC} EQUAL 0 ) if( ${ARGC} EQUAL 0 )
return() # Nothing to do (typically no subprojects created yet) return() # Nothing to do (typically no subprojects created yet)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment