diff options
| author | luwenpeng <[email protected]> | 2021-09-15 17:39:18 +0800 |
|---|---|---|
| committer | luwenpeng <[email protected]> | 2021-09-15 17:42:40 +0800 |
| commit | da5bc120b2f3fce0d1af182a7151b31f272d0b35 (patch) | |
| tree | 945f04f56be1a83c1126d368064f54104d827eea | |
| parent | ba21a53bb7c8bc5e70eae278b2fd238c2bcd1337 (diff) | |
bugfix: RPM 构建失败
| -rw-r--r-- | cmake/Package.cmake | 2 | ||||
| -rw-r--r-- | cmake/Version.cmake | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/cmake/Package.cmake b/cmake/Package.cmake index 154cfcd..f81ce3c 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -29,3 +29,5 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug") else() set(CPACK_RPM_PACKAGE_CONFLICTS "packetadapter-debug") endif() + +include(CPack)
\ No newline at end of file diff --git a/cmake/Version.cmake b/cmake/Version.cmake index 1fb595b..eeec748 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -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 "[T\\:\\+\\-]" "" VERSION_DATE "${VCS_DATE}") -if(VERSION_DAILY_BUILD) - set(VERSION_PATCH ${VERSION_PATCH}.${VERSION_DATE}) -endif() - if(NOT VERSION_MAJOR) set(VERSION_MAJOR 1) endif() @@ -36,6 +32,10 @@ if(NOT VERSION_PATCH) set(VERSION_PATCH 0) endif() +if(VERSION_DAILY_BUILD) + set(VERSION_PATCH ${VERSION_PATCH}.${VERSION_DATE}) +endif() + set(DESCRIBE "${VCS_SHORT_HASH}") set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") set(GIT_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${DESCRIBE}") |