File amd-hipcc-cleanup-build.patch of Package rocm-llvm
diff --git a/amd/hipcc/CMakeLists.txt b/amd/hipcc/CMakeLists.txt
index 484e83353..87cffb4d9 100755
--- a/amd/hipcc/CMakeLists.txt
+++ b/amd/hipcc/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.13.4)
-project(hipcc VERSION "1.1.1" LANGUAGES C CXX)
+project(hipcc VERSION "1.1.1" LANGUAGES CXX)
include(CMakePackageConfigHelpers)
include(GNUInstallDirs)
@@ -22,29 +22,23 @@ set(ADDITIONAL_SHARED_LIBRARIES_TO_LINK
libstdc++fs.so)
set(HIPCC_BIN
- hipcc.bin)
+ hipcc)
set(HIPCC_SOURCES
src/hipBin.cpp)
-
-set(HIPCONFIG_BIN
- hipconfig.bin)
-set(HIPCONFIG_SOURCES
- src/hipBin.cpp)
-
add_executable(${HIPCC_BIN} ${HIPCC_SOURCES})
if(NOT WIN32)
# C++17 does not require std lib linking.
target_link_libraries(${HIPCC_BIN} ${ADDITIONAL_SHARED_LIBRARIES_TO_LINK})
endif()
-add_executable(${HIPCONFIG_BIN} ${HIPCONFIG_SOURCES})
-if(NOT WIN32)
- # C++17 does not require std lib linking.
- target_link_libraries(${HIPCONFIG_BIN} ${ADDITIONAL_SHARED_LIBRARIES_TO_LINK})
-endif()
+set(HIPCONFIG_BIN
+ hipconfig)
-# Copy scripts and batch files to build directory.
-file(COPY ${PROJECT_SOURCE_DIR}/bin/ DESTINATION ${PROJECT_BINARY_DIR})
+add_custom_target(${HIPCONFIG_BIN}-link ALL
+ COMMAND ${CMAKE_COMMAND} -E create_symlink ${HIPCC_BIN} ${HIPCONFIG_BIN}
+ BYPRODUCTS ${HIPCONFIG_BIN}
+ DEPENDS ${HIPCC_BIN}
+ VERBATIM)
# Packaging:
set(CPACK_RPM_COMPONENT_INSTALL ON)
@@ -114,68 +108,11 @@ else()
endif()
set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}.${ROCM_VERSION_FOR_PACKAGE}")
-# Exclude Windows specific BAT scripts from install/packaging for Linux.
-if (NOT WIN32)
- # AMD specific.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin
- DESTINATION .
- USE_SOURCE_PERMISSIONS
- DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- COMPONENT AMD
- FILES_MATCHING
- PATTERN "*"
- PATTERN "*.bat" EXCLUDE)
-
- # NVIDIA specific.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin
- DESTINATION .
- USE_SOURCE_PERMISSIONS
- DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- COMPONENT NVIDIA
- FILES_MATCHING
- PATTERN "*"
- PATTERN "*.bat" EXCLUDE)
-else ()
- # AMD specific.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin
- DESTINATION .
- USE_SOURCE_PERMISSIONS
- DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- COMPONENT AMD)
-
- # NVIDIA specific.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin
- DESTINATION .
- USE_SOURCE_PERMISSIONS
- DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- COMPONENT NVIDIA)
-endif()
-
# AMD specific.
-install(FILES
- "LICENSE.txt"
- "README.md"
- COMPONENT AMD
- DESTINATION ${CMAKE_INSTALL_DOCDIR})
install(TARGETS ${HIPCC_BIN}
- COMPONENT AMD
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-install(TARGETS ${HIPCONFIG_BIN}
- COMPONENT AMD
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-
-# NVIDIA specific.
-install(FILES
- "LICENSE.txt"
- "README.md"
- COMPONENT NVIDIA
- DESTINATION ${CMAKE_INSTALL_DOCDIR})
-install(TARGETS ${HIPCC_BIN}
- COMPONENT NVIDIA
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-install(TARGETS ${HIPCONFIG_BIN}
- COMPONENT NVIDIA
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${HIPCONFIG_BIN}"
+ DESTINATION "${CMAKE_INSTALL_BINDIR}")
# TODO: WIN32 check need to be removed if backward
# compatibility is required for WIN32.