From 910595ac6e37e0fb8716e099379cd08d3cb0dc46 Mon Sep 17 00:00:00 2001 From: davidjsherman Date: Mon, 1 Jan 2018 13:40:53 +0100 Subject: [PATCH] don't automatically add label to buildDir, installDir --- vars/CMake.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/CMake.groovy b/vars/CMake.groovy index 27f67c6..d4d00f5 100644 --- a/vars/CMake.groovy +++ b/vars/CMake.groovy @@ -9,9 +9,9 @@ def call(body) { def workDir = "${pwd()}" // Standardize directory layout - def buildDir = (body.buildDir ?: workDir + '/build') + (body.label ? '/' + body.label : '') + def buildDir = (body.buildDir ?: workDir + '/build' + (body.label ? '/' + body.label : '')) def sourceDir = (body.sourceDir ? workDir + '/' + body.sourceDir : workDir) - def installDir = (body.installDir ?: workDir + '/dist') + (body.label ? '/'+body.label : '') + def installDir = (body.installDir ?: workDir + '/dist' + (body.label ? '/'+body.label : '')) // Default values def cleanBuild = body.cleanBuild ?: true