From 6368c64d4542edb66084c6ad470fa59994c09ab4 Mon Sep 17 00:00:00 2001
From: Daniel Stonier <d.stonier@gmail.com>
Date: Sun, 8 Dec 2013 10:49:17 +0900
Subject: [PATCH] fix unofficial message dependency generation.
---
.../main/groovy/org/ros/gradle_plugins/CatkinPlugin.groovy | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/CatkinPlugin.groovy b/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/CatkinPlugin.groovy
index f1e6333..3729c5b 100644
--- a/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/CatkinPlugin.groovy
+++ b/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/CatkinPlugin.groovy
@@ -171,7 +171,11 @@ class CatkinPackage {
p.group = 'org.ros.rosjava_messages'
p.dependencies.add("compile", 'org.ros.rosjava_bootstrap:message_generation:[0.1,0.2)')
messageDependencies().each { d ->
- p.dependencies.add("compile", 'org.ros.rosjava_messages:' + d + ':[0.1,)')
+ if ( p.getParent().getChildProjects().containsKey(d) ) {
+ p.dependencies.add("compile", p.dependencies.project(path: ':' + d))
+ } else {
+ p.dependencies.add("compile", 'org.ros.rosjava_messages:' + d + ':[0.1,)')
+ }
}
def generatedSourcesDir = "${p.buildDir}/generated-src"
def generateSourcesTask = p.tasks.create("generateSources", JavaExec)
--
GitLab