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

fix unofficial message dependency generation.

parent 696fb8c3
No related branches found
No related tags found
No related merge requests found
...@@ -171,8 +171,12 @@ class CatkinPackage { ...@@ -171,8 +171,12 @@ class CatkinPackage {
p.group = 'org.ros.rosjava_messages' p.group = 'org.ros.rosjava_messages'
p.dependencies.add("compile", 'org.ros.rosjava_bootstrap:message_generation:[0.1,0.2)') p.dependencies.add("compile", 'org.ros.rosjava_bootstrap:message_generation:[0.1,0.2)')
messageDependencies().each { d -> messageDependencies().each { d ->
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,)') p.dependencies.add("compile", 'org.ros.rosjava_messages:' + d + ':[0.1,)')
} }
}
def generatedSourcesDir = "${p.buildDir}/generated-src" def generatedSourcesDir = "${p.buildDir}/generated-src"
def generateSourcesTask = p.tasks.create("generateSources", JavaExec) def generateSourcesTask = p.tasks.create("generateSources", JavaExec)
generateSourcesTask.description = "Generate sources for " + name generateSourcesTask.description = "Generate sources for " + name
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment