Bugfixes for environment variable logic.

Author: stonier

cmake/rosjava.cmake.em

@@ -48,13 +48,13 @@ macro(_rosjava_env)
     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}")
+        set(ROSJAVA_ENV "ROS_MAVEN_DEPLOYMENT_REPOSITORY=${ROS_MAVEN_DEPLOYMENT_REPOSITORY}")
     endif()
     set(ROSJAVA_GRADLE_USER_HOME $ENV{GRADLE_USER_HOME})
     if(NOT ROSJAVA_GRADLE_USER_HOME)
       list(APPEND ROSJAVA_ENV "GRADLE_USER_HOME=${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_GRADLE_DESTINATION}")
     else()
-      list(APPEND ROSJAVA_ENV "${ROSJAVA_ENV};GRADLE_USER_HOME=${ROSJAVA_GRADLE_USER_HOME}")
+      list(APPEND ROSJAVA_ENV "GRADLE_USER_HOME=${ROSJAVA_GRADLE_USER_HOME}")
     endif()
 endmacro()