From 8afb040f8ba40084f208135f619904ee00c0ec1c Mon Sep 17 00:00:00 2001
From: Ranjith Ramakrishnan <Ranjith.Ramakrishnan@amd.com>
Date: Thu, 25 Apr 2024 09:10:43 -0700
Subject: [PATCH] SWDEV-451004 - Remove .bat files from hip-dev/devel package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The .bat file will not be removed from windows pacakge.
Also used cmake install(PROGRAMS …), which will set the correct permission rather than hard coding the permission

Change-Id: I8b57778b59f70e01de949be2ea353b67eec70d2f


[ROCm/clr commit: 9e74f6de8a949407bb139d1bf5e3d275b824fce9]
---
 projects/clr/hipamd/packaging/CMakeLists.txt | 28 ++++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/projects/clr/hipamd/packaging/CMakeLists.txt b/projects/clr/hipamd/packaging/CMakeLists.txt
index 34d6a96338..8f1a1268fc 100644
--- a/projects/clr/hipamd/packaging/CMakeLists.txt
+++ b/projects/clr/hipamd/packaging/CMakeLists.txt
@@ -74,19 +74,25 @@ endif()#End HIP_PLATFORM = "amd"
 #End bianry files install
 
 #Begin dev files install
-if(WIN32)
-  install(DIRECTORY ${HIP_COMMON_DIR}/bin DESTINATION . COMPONENT dev
-          USE_SOURCE_PERMISSIONS)
-else()
-  install(DIRECTORY ${HIP_COMMON_DIR}/bin DESTINATION .  COMPONENT dev
-          USE_SOURCE_PERMISSIONS
-          DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
-          PATTERN *.bat EXCLUDE)
+#Install bin files from HIP_COMMON_DIR
+file(GLOB BIN_FILES ${HIP_COMMON_DIR}/bin/*)
+if(NOT WIN32)
+    list(FILTER BIN_FILES EXCLUDE REGEX ".bat$")
 endif()
+foreach(binFile ${BIN_FILES})
+    install(PROGRAMS ${binFile} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT dev)
+endforeach()
+unset(BIN_FILES)
+
+#Install bin files from hip_SOURCE_DIR
+file(GLOB BIN_FILES ${hip_SOURCE_DIR}/bin/*)
+if(NOT WIN32)
+    list(FILTER BIN_FILES EXCLUDE REGEX ".bat$")
+endif()
+foreach(binFile ${BIN_FILES})
+    install(PROGRAMS ${binFile} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT dev)
+endforeach()
 
-install(DIRECTORY ${hip_SOURCE_DIR}/bin DESTINATION . COMPONENT dev
-        USE_SOURCE_PERMISSIONS
-        DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(DIRECTORY ${HIP_COMMON_DIR}/include DESTINATION . COMPONENT dev)
 install(DIRECTORY ${hip_SOURCE_DIR}/include/hip/amd_detail
         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hip COMPONENT dev)