Add workDir in front of sourceDir only if it isn't there already

aseba-community · Jan 3, 2018 · 811073c · 811073c
1 parent 910595a
commit 811073c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/vars/CMake.groovy b/vars/CMake.groovy
@@ -10,7 +10,7 @@ def call(body) {
 
 	// Standardize directory layout
 	def buildDir = (body.buildDir ?: workDir + '/build' + (body.label ? '/' + body.label : ''))
-	def sourceDir = (body.sourceDir ? workDir + '/' + body.sourceDir : workDir)
+	def sourceDir = (body.sourceDir ? ((body.sourceDir.indexOf(workDir) == 0 ? '' : workDir + '/') + body.sourceDir) : workDir)
 	def installDir = (body.installDir ?: workDir + '/dist' + (body.label ? '/'+body.label : ''))
 
 	// Default values