Skip to content

Commit a91b20b

Browse files
committed
seed ROS_MAVEN_REPOSITORY when necessary.
1 parent 02db012 commit a91b20b

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

cmake/rosjava.cmake.em

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,17 @@ endmacro()
4545
# override a user setting.
4646
macro(_rosjava_env)
4747
set(ROS_MAVEN_DEPLOYMENT_REPOSITORY $ENV{ROS_MAVEN_DEPLOYMENT_REPOSITORY})
48+
set(ROS_MAVEN_REPOSITORY $ENV{ROS_MAVEN_REPOSITORY})
4849
if(NOT ROS_MAVEN_DEPLOYMENT_REPOSITORY)
4950
set(ROSJAVA_ENV "ROS_MAVEN_DEPLOYMENT_REPOSITORY=${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_MAVEN_DESTINATION}")
5051
else()
5152
set(ROSJAVA_ENV "ROS_MAVEN_DEPLOYMENT_REPOSITORY=${ROS_MAVEN_DEPLOYMENT_REPOSITORY}")
5253
endif()
54+
if(NOT ROS_MAVEN_REPOSITORY)
55+
list(APPEND ROSJAVA_ENV "ROS_MAVEN_REPOSITORY=https://github.com/rosjava/rosjava_mvn_repo/raw/master")
56+
else()
57+
set(ROSJAVA_ENV "ROS_MAVEN_REPOSITORY=${ROS_MAVEN_REPOSITORY}")
58+
endif()
5359
# The build farm won't let you access /root/.gradle, so redirect it somewhere practical here.
5460
if(DEFINED CATKIN_BUILD_BINARY_PACKAGE)
5561
list(APPEND ROSJAVA_ENV "GRADLE_USER_HOME=${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_GRADLE_DESTINATION}")

0 commit comments

Comments
 (0)