diff options
| author | liuxueli <[email protected]> | 2020-05-01 13:17:39 +0800 |
|---|---|---|
| committer | liuxueli <[email protected]> | 2020-05-01 13:17:39 +0800 |
| commit | 3d1dd2f610beae97990bda54ca2012501499a864 (patch) | |
| tree | 124e4ad74dc6c852a3f84bbecdc3691fb66bbaec | |
| parent | 331adce429328e9463b1a1b0506dc1c0f9db4725 (diff) | |
| parent | 288e76c43331fd70b43788f141d0c8e7702cc40c (diff) | |
Merge branch 'develop' of https://git.mesalab.cn/tango/tsg_master into developv1.0.5.20.05-testv1.0.4
# Conflicts:
# cmake/Package.cmake
# src/CMakeLists.txt
| -rw-r--r-- | cmake/Package.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/Package.cmake b/cmake/Package.cmake index 8fcd6ee..edb4258 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -14,8 +14,8 @@ set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) set(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_BUILD}") execute_process(COMMAND bash -c "echo -ne \"`uname -r | awk -F'.' '{print $5\".\"$6\".\"$7}'`\"" OUTPUT_VARIABLE SYSTEM_VERSION) -#execute_process(COMMAND sh changelog.sh WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/cmake) -#SET(CPACK_RPM_CHANGELOG_FILE ${PROJECT_SOURCE_DIR}/cmake/changelog.txt) +execute_process(COMMAND sh changelog.sh WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/cmake) +SET(CPACK_RPM_CHANGELOG_FILE ${PROJECT_SOURCE_DIR}/cmake/changelog.txt) # RPM Build set(CPACK_GENERATOR "RPM") |