summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorliuxueli <[email protected]>2019-12-24 14:39:28 +0800
committerliuxueli <[email protected]>2019-12-24 14:39:28 +0800
commit5feb1c790d46ef09230dd0cbe88a9f8e0b80fc9d (patch)
tree2783982dc887d67d00f21c21f73de15916192260 /cmake
parentd65b4f2d02bb4c6789f6788f1ae2f9126968d805 (diff)
修复对上层业务返回值判断逻辑错误,在串联环境下上层业务返回PROT_STATE_DROPPKT|PORT_STATE_DROPME时,解析层仅返回APP_STATE_DROPPKT,已修复
使用git自动打版本号
Diffstat (limited to 'cmake')
-rw-r--r--cmake/Version.cmake3
1 files changed, 1 insertions, 2 deletions
diff --git a/cmake/Version.cmake b/cmake/Version.cmake
index 088b05a..b7d6110 100644
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -1,4 +1,3 @@
-
# Using autorevision.sh to generate version information
set(__SOURCE_AUTORESIVISION ${CMAKE_SOURCE_DIR}/autorevision.sh)
@@ -40,5 +39,5 @@ message(STATUS "Version: ${VERSION}-${VERSION_BUILD}")
set(GIT_VERSION
"${VERSION}-${CMAKE_BUILD_TYPE}-${VERSION_BUILD}-${VCS_BRANCH}-${VCS_TAG}-${VCS_DATE}")
-string(REGEX REPLACE "[-:+]" "_" GIT_VERSION ${GIT_VERSION})
+string(REGEX REPLACE "[-:+/\\.]" "_" GIT_VERSION ${GIT_VERSION})
add_definitions(-DGIT_VERSION=${GIT_VERSION})