From f4c73095925847849ae66d4ce3936155986701a5 Mon Sep 17 00:00:00 2001 From: Icarus Sparry Date: Wed, 10 Nov 2021 01:05:37 +0000 Subject: [PATCH] Allow creation of just deb or rpm Remove hard code of generating both deb and rpm, allow the user to specify what is desired and cache that choice. Create executable with owner write permission to work around binutils bug. Change-Id: I67655e5d351b227d1a8db4645228300d2bb83f9a Signed-off-by: Icarus Sparry --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 43ac1bc50b..b1547cc802 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -170,7 +170,7 @@ install ( FILES # libtool.so install ( FILES ${PROJECT_BINARY_DIR}/test/libtool.so DESTINATION ${DEST_NAME}/tool ) install ( FILES ${PROJECT_BINARY_DIR}/test/ctrl DESTINATION ${DEST_NAME}/tool - PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE ) + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE ) # links install ( FILES ${PROJECT_BINARY_DIR}/so-link DESTINATION lib RENAME ${ROCPROFILER_LIBRARY}.so ) #install ( FILES ${PROJECT_BINARY_DIR}/inc-link DESTINATION include RENAME ${DEST_NAME} ) @@ -179,7 +179,7 @@ install ( FILES ${PROJECT_BINARY_DIR}/rocprof-link DESTINATION bin RENAME rocprof ) ## Packaging directives -set ( CPACK_GENERATOR "DEB" "RPM" "TGZ" ) +set ( CPACK_GENERATOR "DEB" "RPM" "TGZ" CACHE STRING "CPACK GENERATOR e.g. DEB;RPM" ) set ( ENABLE_LDCONFIG ON CACHE BOOL "Set library links and caches using ldconfig.") set ( CPACK_PACKAGE_NAME "${ROCPROFILER_NAME}-dev" ) set ( CPACK_PACKAGE_VENDOR "Advanced Micro Devices, Inc." )