diff options
| author | Alexey Bychko <alexey.bychko@mariadb.com> | 2021-08-27 12:54:42 +0700 |
|---|---|---|
| committer | Alexey Bychko <alexey.bychko@mariadb.com> | 2021-08-27 12:54:42 +0700 |
| commit | 4b6ef03dcda608109f0455732ab9ed65f32b06bb (patch) | |
| tree | 72b68a053778025af8a8d391621d4326476a50bd | |
| parent | 87ff4ba7c874ccb8a5b1105571569a94ca959d53 (diff) | |
| download | mariadb-git-bb-10.5-abychko.tar.gz | |
MDEV-26438 cmake < 3.6.0 produced RPMs with invalid namesbb-10.5-abychko
replaced CPACK_RPM_PACKAGE_VERSION with SERVER_VERSION.
CPACK_* variables are empty and can't be used until INCLUDE(CPack) is
called.
SERVER_VERSION is the safest option because other variables may be
overwritten from submodules
| -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 60470779d1f..583bb81dafd 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) |