From 30cf8ec560a1a3bb00c74e77db773263e6d99cde Mon Sep 17 00:00:00 2001 From: Henry Bruce Date: Thu, 23 Jul 2015 14:55:02 -0700 Subject: [PATCH] cmake: Set install prefix to /usr for RPM packaging Signed-off-by: Henry Bruce Signed-off-by: Brendan Le Foll --- CMakeLists.txt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d2e5c0..e8b98bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -155,6 +155,7 @@ endif() if (RPM) message (INFO " - Enabled RPM packaging for ${DETECTED_ARCH}") + set(CMAKE_INSTALL_PREFIX "/usr") set(CPACK_PACKAGE_VERSION ${VERSION}) set(CPACK_GENERATOR "RPM") set(CPACK_PACKAGE_NAME "libmraa${mraa_VERSION_MAJOR}") @@ -164,12 +165,14 @@ if (RPM) set(CPACK_PACKAGE_CONTACT "Intel IoT-Devkit") set(CPACK_PACKAGE_VENDOR "Intel IoT-Devkit") set(CPACK_RPM_PACKAGE_PROVIDES "${CPACK_PACKAGE_NAME}-devel") - EXECUTE_PROCESS(COMMAND rpm --showrc - COMMAND grep -E "dist[[:space:]]*\\." - COMMAND sed -e "s/^.*dist\\s*\\.//" - COMMAND tr \\n \\t - COMMAND sed -e s/\\t// - OUTPUT_VARIABLE DIST_TAG) + # Get distro tag (e.g. 'fc20') by parsing output of rpm --showrc + EXECUTE_PROCESS( + COMMAND rpm --showrc + COMMAND grep -w dist + COMMAND sed -e "s/\\t./ /" + COMMAND awk "{printf \"%s\", \$NF}" + OUTPUT_VARIABLE DIST_TAG + ) set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${DIST_TAG}.${DETECTED_ARCH}") include(CPack) endif()