diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-31 11:00:41 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-31 11:00:41 +0300 |
| commit | e94172c2a07f21118d26e4cde0c48a2fd536cf06 (patch) | |
| tree | 81d6b9b67c696e93abb618df35ab5a27094f6e31 /cmake | |
| parent | 7271cf48d62196abc0c578d00ab3ca09b56aae77 (diff) | |
| parent | e62120cec7aa21b9cf77773ecb0935b4b48ed26c (diff) | |
| download | mariadb-git-e94172c2a07f21118d26e4cde0c48a2fd536cf06.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/cpack_rpm.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index f577e343dc1..5f954c7a1fe 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -35,7 +35,7 @@ SET(CPACK_COMPONENTS_ALL Server ManPagesServer IniFiles Server_Scripts SET(CPACK_RPM_PACKAGE_NAME ${CPACK_PACKAGE_NAME}) SET(CPACK_RPM_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION}) IF(CMAKE_VERSION VERSION_LESS "3.6.0") - SET(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${CPACK_RPM_PACKAGE_VERSION}-${RPM}-${CMAKE_SYSTEM_PROCESSOR}") + SET(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${SERVER_VERSION}-${RPM}-${CMAKE_SYSTEM_PROCESSOR}") ELSE() SET(CPACK_RPM_FILE_NAME "RPM-DEFAULT") OPTION(CPACK_RPM_DEBUGINFO_PACKAGE "" ON) |