Merge remote-tracking branch 'remotes/origin/amd-staging' into amd-ma…

…ster Change-Id: I8bed468b05991f5967fe6d9b9ff49ac45120f9cc
ROCm · Feb 16, 2022 · 38397cb · 38397cb
2 parents a19a826 + c037ccb
commit 38397cb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -168,7 +168,7 @@ install ( FILES ${PROJECT_BINARY_DIR}/so-roctx-major-link DESTINATION lib RENAME
 install ( FILES ${PROJECT_BINARY_DIR}/so-roctx-patch-link DESTINATION lib RENAME ${ROCTX_LIBRARY}.so.${LIB_VERSION_STRING} )
 
 ## Packaging directives
-set ( CPACK_GENERATOR "DEB" "RPM" "TGZ" )
+set ( CPACK_GENERATOR "DEB" "RPM" "TGZ" CACHE STRING "CPACK GENERATOR DEB;RPM")
 set ( ENABLE_LDCONFIG ON CACHE BOOL "Set library links and caches using ldconfig.")
 set ( CPACK_PACKAGE_NAME "${ROCTRACER_NAME}-dev" )
 set ( CPACK_PACKAGE_VENDOR "Advanced Micro Devices, Inc." )

diff --git a/build.sh b/build.sh
@@ -37,7 +37,7 @@ cmake \
     -DCMAKE_PREFIX_PATH="$PREFIX_PATH" \
     -DCMAKE_INSTALL_PREFIX=$PACKAGE_ROOT \
     -DCPACK_PACKAGING_INSTALL_PREFIX=$PACKAGE_PREFIX \
-    -DCPACK_GENERATOR="DEB;RPM" \
+    -DCPACK_GENERATOR="${CPACKGEN:-"DEB;RPM"}" \
     -DCMAKE_SHARED_LINKER_FLAGS="$LD_RUNPATH_FLAG" \
     -DHIP_VDI="$HIP_VDI" \
     -DHIP_API_STRING="$HIP_API_STRING" \