From a5b2326a34415124e9df60620fb8af29d195e544 Mon Sep 17 00:00:00 2001 From: yangwei Date: Tue, 3 Nov 2020 10:39:31 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9Efix(ci):=20version.cmake?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/Version.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/Version.cmake b/cmake/Version.cmake index 4a765e4..5310831 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -20,6 +20,8 @@ string(REGEX REPLACE "^v([0-9]+)\\..*" "\\1" VERSION_MAJOR "${VCS_TAG}") string(REGEX REPLACE "^v[0-9]+\\.([0-9]+).*" "\\1" VERSION_MINOR "${VCS_TAG}") string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" VERSION_PATCH "${VCS_TAG}") +string(REGEX REPLACE "[T\\:\\+\\-]" "" VERSION_DATE "${VCS_DATE}") + if(VERSION_DAILY_BUILD) set(VERSION_PATCH ${VERSION_PATCH}.${VERSION_DATE}) endif() @@ -45,9 +47,7 @@ message(STATUS "Version: ${VERSION}-${VERSION_BUILD}") option(DEFINE_GIT_VERSION "Set DEFINE_GIT_VERSION to TRUE or FALSE" TRUE) if(DEFINE_GIT_VERSION) - set(GIT_VERSION - "${VERSION}-${CMAKE_BUILD_TYPE}-${VERSION_BUILD}-${VCS_BRANCH}-${VCS_TAG}-${VCS_DATE}") + set(GIT_VERSION "${VERSION}-${CMAKE_BUILD_TYPE}-${VERSION_BUILD}-${VCS_BRANCH}-${VCS_DATE}") string(REGEX REPLACE "[-:+/\\.]" "_" GIT_VERSION ${GIT_VERSION}) - - add_definitions(-DGIT_VERSION=${GIT_VERSION}) + add_definitions(-DGIT_VERSION=\"${GIT_VERSION}\") endif()