From 3e51fd20a27902f27c5e30205573a4691d28afa7 Mon Sep 17 00:00:00 2001 From: "Bernhard F.W. Gschaider" Date: Thu, 29 May 2014 21:31:56 +0200 Subject: [PATCH] Fix extra apostrophes added to the BUILDNAME which were added by a previous change --- CMakeLists.txt | 7 ++++--- testHarness/foam-extend/3.0/CMakeFiles/CMakeLists.txt | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9370cea75..26e717d73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -130,11 +130,12 @@ if(GIT_FOUND) ARGS id OUTPUT_VARIABLE GIT_BRANCH_NAME ) + string(REPLACE " " "_" GIT_BRANCH_NAME ${GIT_BRANCH_NAME}) + string(REPLACE "+" "_modified" GIT_BRANCH_NAME ${GIT_BRANCH_NAME}) + SET(GIT_BRANCH_NAME "hg_${GIT_BRANCH_NAME}") message("Git branch (mercurial): ${GIT_BRANCH_NAME}") endif() - SET(BUILDNAME "${BUILDNAME}-git-branch='hg_${GIT_BRANCH_NAME}'") - string(REPLACE " " "_" BUILDNAME ${BUILDNAME}) - string(REPLACE "+" "_modified" BUILDNAME ${BUILDNAME}) + SET(BUILDNAME "${BUILDNAME}-git-branch=${GIT_BRANCH_NAME}") endif() # Some last minute cleanup diff --git a/testHarness/foam-extend/3.0/CMakeFiles/CMakeLists.txt b/testHarness/foam-extend/3.0/CMakeFiles/CMakeLists.txt index 9370cea75..26e717d73 100644 --- a/testHarness/foam-extend/3.0/CMakeFiles/CMakeLists.txt +++ b/testHarness/foam-extend/3.0/CMakeFiles/CMakeLists.txt @@ -130,11 +130,12 @@ if(GIT_FOUND) ARGS id OUTPUT_VARIABLE GIT_BRANCH_NAME ) + string(REPLACE " " "_" GIT_BRANCH_NAME ${GIT_BRANCH_NAME}) + string(REPLACE "+" "_modified" GIT_BRANCH_NAME ${GIT_BRANCH_NAME}) + SET(GIT_BRANCH_NAME "hg_${GIT_BRANCH_NAME}") message("Git branch (mercurial): ${GIT_BRANCH_NAME}") endif() - SET(BUILDNAME "${BUILDNAME}-git-branch='hg_${GIT_BRANCH_NAME}'") - string(REPLACE " " "_" BUILDNAME ${BUILDNAME}) - string(REPLACE "+" "_modified" BUILDNAME ${BUILDNAME}) + SET(BUILDNAME "${BUILDNAME}-git-branch=${GIT_BRANCH_NAME}") endif() # Some last minute cleanup