diff options
| author | Daniel Black <daniel@mariadb.org> | 2023-01-12 10:34:14 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2023-01-17 13:53:06 +1100 |
| commit | 314e50b464e31a45c791ea47661efdadf924cfc5 (patch) | |
| tree | 9b0449e8d2a94bf95792a0737e5457fc1b38f8c5 | |
| parent | 44dce3b2077e64a1efc607668d0d7b42a7c4ee78 (diff) | |
| download | mariadb-git-314e50b464e31a45c791ea47661efdadf924cfc5.tar.gz | |
Use MariaDB as the project name in CMakeLists.txt (fix)
Partial revert of d29d915790f7da41cd89c469f0a4c6c9b8f8a5c3.
It seems from CI that lower case RPM names are generated without
explictly setting the package name to mixed case.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/cpack_rpm.cmake | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7fcd4d9347f..3ac59eeefa6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,6 +88,8 @@ ELSE() SET(CMAKE_CXX_STANDARD 11) ENDIF() +# Lower case package names from PROJECT are used if not explictly upper case. +SET(CPACK_PACKAGE_NAME "MariaDB") SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MariaDB: a very fast and robust SQL database server") SET(CPACK_PACKAGE_URL "http://mariadb.org") diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index f14bc9e93b8..339363b2169 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -34,6 +34,7 @@ SET(CPACK_COMPONENTS_ALL Server ManPagesServer IniFiles Server_Scripts backup ) +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}-${SERVER_VERSION}-${RPM}-${CMAKE_SYSTEM_PROCESSOR}") |