Skip to content

Commit

Permalink
don't automatically add label to buildDir, installDir
Browse files Browse the repository at this point in the history
  • Loading branch information
davidjsherman committed Jan 1, 2018
1 parent e9617c2 commit 910595a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions vars/CMake.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 910595a

Please sign in to comment.