From 8fe83114833c86c24627f9e68800380f25f778d2 Mon Sep 17 00:00:00 2001 From: Paolo Andreetto Date: Wed, 5 Jun 2019 13:33:06 +0000 Subject: [PATCH] Cmake property for rpm release number --- CMake/uLibGenerateRPMS.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMake/uLibGenerateRPMS.cmake b/CMake/uLibGenerateRPMS.cmake index b12e41e..f0a8363 100644 --- a/CMake/uLibGenerateRPMS.cmake +++ b/CMake/uLibGenerateRPMS.cmake @@ -1,6 +1,6 @@ # Target for RPMs creation -set(PKGREL 1) +set(PKGREL 1 CACHE STRING "Package build number") set(ITEMS_FOR_SOURCE AUTHORS CMakeConfig.in.h CMakePkgConfig.pc.in @@ -18,7 +18,7 @@ set(ITEMS_FOR_SOURCE AUTHORS uLib.files uLib.includes) -add_custom_target(rpm +add_custom_target(rpm COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/rpmbuild/BUILD ${CMAKE_CURRENT_BINARY_DIR}/rpmbuild/RPMS ${CMAKE_CURRENT_BINARY_DIR}/rpmbuild/SOURCES @@ -26,7 +26,7 @@ add_custom_target(rpm ${CMAKE_CURRENT_BINARY_DIR}/rpmbuild/SRPMS COMMAND tar -zcf ${CMAKE_CURRENT_BINARY_DIR}/rpmbuild/SOURCES/cmt-ulib-${PACKAGE_VERSION}.tar.gz ${ITEMS_FOR_SOURCE} COMMAND sed -e 's|@PKGVERSION@|${PACKAGE_VERSION}|g' - -e 's|@PKGRELEASE@|${PKGREL}|g' + -e 's|@PKGRELEASE@|${PKGREL}|g' CMake/cmt-ulib.spec.in > ${CMAKE_CURRENT_BINARY_DIR}/rpmbuild/SPECS/cmt-ulib.spec COMMAND QA_SKIP_BUILD_ROOT=1 rpmbuild -ba --define '_topdir ${CMAKE_CURRENT_BINARY_DIR}/rpmbuild' ${CMAKE_CURRENT_BINARY_DIR}/rpmbuild/SPECS/cmt-ulib.spec