From aad8a70ac3cf98596c9e55eae1181cad75ead05b Mon Sep 17 00:00:00 2001
From: Daniel Stonier <d.stonier@gmail.com>
Date: Thu, 31 Oct 2013 17:03:52 +0900
Subject: [PATCH] seed ROS_MAVEN_REPOSITORY when necessary.
---
cmake/rosjava.cmake.em | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/cmake/rosjava.cmake.em b/cmake/rosjava.cmake.em
index cc57f94..3d0a155 100644
--- a/cmake/rosjava.cmake.em
+++ b/cmake/rosjava.cmake.em
@@ -45,11 +45,17 @@ endmacro()
# override a user setting.
macro(_rosjava_env)
set(ROS_MAVEN_DEPLOYMENT_REPOSITORY $ENV{ROS_MAVEN_DEPLOYMENT_REPOSITORY})
+ set(ROS_MAVEN_REPOSITORY $ENV{ROS_MAVEN_REPOSITORY})
if(NOT ROS_MAVEN_DEPLOYMENT_REPOSITORY)
set(ROSJAVA_ENV "ROS_MAVEN_DEPLOYMENT_REPOSITORY=${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_MAVEN_DESTINATION}")
else()
set(ROSJAVA_ENV "ROS_MAVEN_DEPLOYMENT_REPOSITORY=${ROS_MAVEN_DEPLOYMENT_REPOSITORY}")
endif()
+ if(NOT ROS_MAVEN_REPOSITORY)
+ list(APPEND ROSJAVA_ENV "ROS_MAVEN_REPOSITORY=https://github.com/rosjava/rosjava_mvn_repo/raw/master")
+ else()
+ set(ROSJAVA_ENV "ROS_MAVEN_REPOSITORY=${ROS_MAVEN_REPOSITORY}")
+ endif()
# The build farm won't let you access /root/.gradle, so redirect it somewhere practical here.
if(DEFINED CATKIN_BUILD_BINARY_PACKAGE)
list(APPEND ROSJAVA_ENV "GRADLE_USER_HOME=${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_GRADLE_DESTINATION}")
--
GitLab