diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-06-27 16:34:36 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-06-27 16:34:36 +0300 |
| commit | 330792f3c3c5007dd92912b9d1d32da178b5b9fd (patch) | |
| tree | 2137a9bab3d0cf21d771c298379694e504745288 /cmake | |
| parent | 3125ba891292ff16186c105b6780fbadc74421e9 (diff) | |
| parent | 32659db8644504940f8d34835fde8f7b6535f1ee (diff) | |
| download | mariadb-git-330792f3c3c5007dd92912b9d1d32da178b5b9fd.tar.gz | |
Merge branch 'bb-10.1-vicentiu' into 10.1
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/cpack_rpm.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index d6f43e3f730..e886cea1cc1 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -33,7 +33,12 @@ SET(CPACK_COMPONENTS_ALL Server ManPagesServer IniFiles Server_Scripts ) SET(CPACK_RPM_PACKAGE_NAME ${CPACK_PACKAGE_NAME}) -SET(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${VERSION}-${RPM}-${CMAKE_SYSTEM_PROCESSOR}") +IF(CMAKE_VERSION VERSION_LESS "3.6.0") + SET(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${VERSION}-${RPM}-${CMAKE_SYSTEM_PROCESSOR}") +ELSE() + SET(CPACK_RPM_FILE_NAME "RPM-DEFAULT") + SET(CPACK_RPM_DEBUGINFO_PACKAGE ON) +ENDIF() SET(CPACK_RPM_PACKAGE_RELEASE "1%{?dist}") SET(CPACK_RPM_PACKAGE_LICENSE "GPLv2") |