Skip to content

Commit 06a4f5c

Browse files
arvindcheruDavid Salinas
authored andcommitted
SWDEV-342167 Update Binary Install Type Permissions for hipcc files
Change-Id: I22300c562d3d61fb4e0de007cdc2bd54d2a0a5b4
1 parent 76a1d46 commit 06a4f5c

File tree

2 files changed

+26
-17
lines changed

2 files changed

+26
-17
lines changed

amd/hipcc/CMakeLists.txt

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -117,24 +117,33 @@ set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSIO
117117
# Exclude Windows specific BAT scripts from install/packaging for Linux.
118118
if (NOT WIN32)
119119
# AMD specific.
120-
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin
121-
DESTINATION .
122-
USE_SOURCE_PERMISSIONS
123-
DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
124-
COMPONENT AMD
125-
FILES_MATCHING
126-
PATTERN "*"
127-
PATTERN "*.bat" EXCLUDE)
120+
file(GLOB install_bin_files "${CMAKE_CURRENT_SOURCE_DIR}/bin/*")
121+
foreach(ITEM ${install_bin_files})
122+
# Exclude *.bat files
123+
if(NOT "${ITEM}" MATCHES ".bat$")
124+
# For *.pm files not require binary permissions
125+
if("${ITEM}" MATCHES ".pm$")
126+
LIST( APPEND gen_files "${ITEM}" )
127+
else()
128+
LIST( APPEND bin_files "${ITEM}" )
129+
endif()
130+
endif()
131+
endforeach()
132+
# Install with right type and Permissions
133+
install(PROGRAMS ${bin_files}
134+
DESTINATION ./bin
135+
COMPONENT AMD)
136+
install(FILES ${gen_files}
137+
DESTINATION ./bin
138+
COMPONENT AMD)
128139

129140
# NVIDIA specific.
130-
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin
131-
DESTINATION .
132-
USE_SOURCE_PERMISSIONS
133-
DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
134-
COMPONENT NVIDIA
135-
FILES_MATCHING
136-
PATTERN "*"
137-
PATTERN "*.bat" EXCLUDE)
141+
install(PROGRAMS ${bin_files}
142+
DESTINATION ./bin
143+
COMPONENT NVIDIA)
144+
install(FILES ${gen_files}
145+
DESTINATION ./bin
146+
COMPONENT NVIDIA)
138147
else ()
139148
# AMD specific.
140149
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin

openmp/libompd/gdb-plugin/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,5 +94,5 @@ target_link_libraries (ompdModule ${CLANG_CPP})
9494
set_target_properties (ompdModule PROPERTIES PREFIX "")
9595
set_target_properties (ompdModule PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/python-module/ompd/")
9696

97-
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/python-module/ompd DESTINATION share/gdb/python/ PATTERN ompdModule.so PERMISSIONS OWNER_READ WORLD_READ GROUP_READ OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)
97+
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/python-module/ompd DESTINATION share/gdb/python/ PATTERN ompdModule.so)
9898

0 commit comments

Comments
 (0)