From ce49edfcb72f52ff9ccb4042db51dcf00dfa1972 Mon Sep 17 00:00:00 2001 From: Chris Freehill Date: Wed, 1 Jul 2020 18:25:55 -0500 Subject: [PATCH] Fix package names to DEB and RPM convention Added a CPACK_PROJECT_CONFIG_FILE called package.txt for this. Change-Id: Ia2b2c6cdb98506510a8fa6881d814804108553db (cherry picked from commit 8c803f85df0c23c7e30dadc0ab9748749a1d3588) [ROCm/rdc commit: 4045a59bb4ca6cf73b417f5fe701136798b8baf0] --- projects/rdc/CMakeLists.txt | 4 +++- projects/rdc/package.txt | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 projects/rdc/package.txt diff --git a/projects/rdc/CMakeLists.txt b/projects/rdc/CMakeLists.txt index 96f16055f9..622c8b6b7a 100755 --- a/projects/rdc/CMakeLists.txt +++ b/projects/rdc/CMakeLists.txt @@ -163,7 +163,9 @@ add_subdirectory("rdc_libs") add_subdirectory("example") add_subdirectory("rdci") -set(CPACK_PACKAGE_FILE_NAME "${RDC_PACKAGE}_${PKG_VERSION_STR}") +set(CPACK_PACKAGE_NAME ${RDC_PACKAGE}) +set(CPACK_PACKAGE_VERSION ${PKG_VERSION_STR}) +set(CPACK_PROJECT_CONFIG_FILE ${CMAKE_SOURCE_DIR}/package.txt) # This is used by configure_file for *_postinit.in set(RDC_CLIENT_ROOT_PATH "${RDC_SERVER_ROOT_PATH}/${RDC_CLIENT_INSTALL_PREFIX}") diff --git a/projects/rdc/package.txt b/projects/rdc/package.txt new file mode 100644 index 0000000000..6fdb491473 --- /dev/null +++ b/projects/rdc/package.txt @@ -0,0 +1,6 @@ +if (CPACK_GENERATOR MATCHES "DEB") + set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}_amd64") +elseif (CPACK_GENERATOR MATCHES "RPM") + set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}.x86_64") +endif() +