gfwleak/tsg-packetadapter
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix: RPM 构建失败

Browse Source
This commit is contained in:
luwenpeng
2021-09-15 17:39:18 +08:00
parent ba21a53bb7
commit da5bc120b2
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/Package.cmake
View File

@@ -29,3 +29,5 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
else() else()
set(CPACK_RPM_PACKAGE_CONFLICTS "packetadapter-debug") set(CPACK_RPM_PACKAGE_CONFLICTS "packetadapter-debug")
endif() endif()
include(CPack)

8
cmake/Version.cmake
View File

@@ -20,10 +20,6 @@ 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 "^v[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" VERSION_PATCH "${VCS_TAG}")
string(REGEX REPLACE "[T\\:\\+\\-]" "" VERSION_DATE "${VCS_DATE}") string(REGEX REPLACE "[T\\:\\+\\-]" "" VERSION_DATE "${VCS_DATE}")
if(VERSION_DAILY_BUILD)
set(VERSION_PATCH ${VERSION_PATCH}.${VERSION_DATE})
endif()
if(NOT VERSION_MAJOR) if(NOT VERSION_MAJOR)
set(VERSION_MAJOR 1) set(VERSION_MAJOR 1)
endif() endif()
@@ -36,6 +32,10 @@ if(NOT VERSION_PATCH)
set(VERSION_PATCH 0) set(VERSION_PATCH 0)
endif() endif()
if(VERSION_DAILY_BUILD)
set(VERSION_PATCH ${VERSION_PATCH}.${VERSION_DATE})
endif()
set(DESCRIBE "${VCS_SHORT_HASH}") set(DESCRIBE "${VCS_SHORT_HASH}")
set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
set(GIT_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${DESCRIBE}") set(GIT_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${DESCRIBE}")