From b6b7d892c268de4b6a693086f5f9710bdf122585 Mon Sep 17 00:00:00 2001 From: Mihai Tudor Panu Date: Thu, 7 Apr 2016 16:21:45 -0700 Subject: [PATCH] cmake: fix RPM generation when VERSION_COMMIT is empty string Signed-off-by: Mihai Tudor Panu --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f6a72e9..9e5bb7cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -205,12 +205,17 @@ if (RPM) set(CPACK_PACKAGE_VERSION ${VERSION}) set(CPACK_GENERATOR "RPM") set(CPACK_PACKAGE_NAME "upm") + set(upm_PACKAGE_ON_TAG ".") + if ("${VERSION_COMMIT}" STREQUAL "") + set(upm_PACKAGE_ON_TAG "") + endif() set(CPACK_PACKAGE_VERSION - "${upm_VERSION_MAJOR}.${upm_VERSION_MINOR}.${upm_VERSION_PATCH}.${upm_PACKAGE_ON_TAG}${VERSION_COMMIT}") + "${upm_VERSION_MAJOR}.${upm_VERSION_MINOR}.${upm_VERSION_PATCH}${upm_PACKAGE_ON_TAG}${VERSION_COMMIT}") set(CPACK_PACKAGE_CONTACT "Intel IoT-Devkit") set(CPACK_PACKAGE_VENDOR "Intel IoT-Devkit") set(CPACK_RPM_PACKAGE_REQUIRES "mraa >= ${MRAA_VERSION}") set(CPACK_RPM_PACKAGE_PROVIDES "${CPACK_PACKAGE_NAME}-devel") + set(CPACK_RPM_PACKAGE_LICENSE "MIT") EXECUTE_PROCESS(COMMAND rpm --showrc COMMAND grep -E "dist[[:space:]]*\\." COMMAND sed -e "s/^.*dist\\s*\\.//"