From 44713a68ed91d70c341735b2e6e508bc62a81e4a Mon Sep 17 00:00:00 2001 From: Nik Nyby Date: Mon, 18 Apr 2022 20:11:42 -0400 Subject: [PATCH] Add: [CMake] support rpm for fedora and rhel (#9861) --- cmake/InstallAndPackage.cmake | 6 +++++- cmake/PackageRPM.cmake | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 cmake/PackageRPM.cmake diff --git a/cmake/InstallAndPackage.cmake b/cmake/InstallAndPackage.cmake index 057f0934f8..f8f0d3ca5c 100644 --- a/cmake/InstallAndPackage.cmake +++ b/cmake/InstallAndPackage.cmake @@ -129,7 +129,7 @@ if(APPLE) set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-macos-universal") else() set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-macos-${CPACK_SYSTEM_NAME}") - endif() + endif() elseif(WIN32) set(CPACK_GENERATOR "ZIP") if(OPTION_USE_NSIS) @@ -181,6 +181,10 @@ elseif(UNIX) if(DISTRO_ID STREQUAL "arch") set(PLATFORM "arch") set(CPACK_GENERATOR "TXZ") + elseif(DISTRO_ID STREQUAL "fedora" OR DISTRO_ID STREQUAL "rhel") + set(PLATFORM "fedora") + set(CPACK_GENERATOR "RPM") + include(PackageRPM) else() set(UNSUPPORTED_PLATFORM_NAME "Linux distribution '${DISTRO_ID}' from /etc/os-release") endif() diff --git a/cmake/PackageRPM.cmake b/cmake/PackageRPM.cmake new file mode 100644 index 0000000000..d91bb28326 --- /dev/null +++ b/cmake/PackageRPM.cmake @@ -0,0 +1 @@ +set(CPACK_RPM_PACKAGE_ARCHITECTURE "${ARCHITECTURE}")