From 9bb2ce01d8487312391674c5d649495e3e67f41f Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Mon, 14 Nov 2022 09:10:45 +0000 Subject: [PATCH] SWDEV-361840 - Remove duplicate entry in backward-compat.cmake Change-Id: I7cc95ce6894f7891aa34188238413036d825daf7 [ROCm/clr commit: 7cb650f154b3527266d58acc8ee1f356c409f1e1] --- projects/clr/hipamd/hip-backward-compat.cmake | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/projects/clr/hipamd/hip-backward-compat.cmake b/projects/clr/hipamd/hip-backward-compat.cmake index b9154e5c22..16348c935a 100644 --- a/projects/clr/hipamd/hip-backward-compat.cmake +++ b/projects/clr/hipamd/hip-backward-compat.cmake @@ -167,6 +167,7 @@ endfunction() function(create_cmake_symlink) file(MAKE_DIRECTORY ${HIP_WRAPPER_CMAKE_DIR}/hip) + #create symlink to all hip config files file(GLOB config_files ${HIP_BUILD_DIR}/hip-config*) foreach(config_name ${config_files}) @@ -176,8 +177,9 @@ function(create_cmake_symlink) COMMAND ${CMAKE_COMMAND} -E create_symlink ../../../../${CMAKE_INSTALL_LIBDIR}/cmake/hip/${file_name} ${HIP_WRAPPER_CMAKE_DIR}/hip/${file_name}) endforeach() - #create symlink to hip-lang unset(config_files) + + #create symlink to hip-lang file(MAKE_DIRECTORY ${HIP_WRAPPER_CMAKE_DIR}/hip-lang) file(GLOB config_files ${HIP_BUILD_DIR}/src/hip-lang-config*) foreach(config_name ${config_files}) @@ -187,7 +189,6 @@ function(create_cmake_symlink) COMMAND ${CMAKE_COMMAND} -E create_symlink ../../../../${CMAKE_INSTALL_LIBDIR}/cmake/hip-lang/${file_name} ${HIP_WRAPPER_CMAKE_DIR}/hip-lang/${file_name}) endforeach() - unset(config_files) #create symlink to hiprtc config files @@ -200,16 +201,11 @@ function(create_cmake_symlink) COMMAND ${CMAKE_COMMAND} -E create_symlink ../../../../${CMAKE_INSTALL_LIBDIR}/cmake/hiprtc/${file_name} ${HIP_WRAPPER_CMAKE_DIR}/hiprtc/${file_name}) endforeach() - - add_custom_target(link_target ALL - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND ${CMAKE_COMMAND} -E create_symlink - ../../../../${CMAKE_INSTALL_LIBDIR}/cmake/hiprtc/hiprtc-config.cmake ${HIP_WRAPPER_CMAKE_DIR}/hiprtc/hiprtc-config.cmake) - unset(config_files) + + #create symlink to FindHIP file(MAKE_DIRECTORY ${HIP_WRAPPER_FINDHIP_DIR}/FindHIP) file(GLOB config_files ${HIP_BUILD_DIR}/cmake/FindHIP/*.cmake) - #create symlink to FindHIP foreach(config_name ${config_files}) get_filename_component(file_name ${config_name} NAME) add_custom_target(link_${file_name} ALL @@ -217,8 +213,8 @@ function(create_cmake_symlink) COMMAND ${CMAKE_COMMAND} -E create_symlink ../../../${CMAKE_INSTALL_LIBDIR}/cmake/hip/FindHIP/${file_name} ${HIP_WRAPPER_FINDHIP_DIR}/FindHIP/${file_name}) endforeach() - unset(config_files) + file(GLOB config_files ${HIP_BUILD_DIR}/cmake/*.cmake) foreach(config_name ${config_files}) get_filename_component(file_name ${config_name} NAME) @@ -227,6 +223,7 @@ function(create_cmake_symlink) COMMAND ${CMAKE_COMMAND} -E create_symlink ../../${CMAKE_INSTALL_LIBDIR}/cmake/hip/${file_name} ${HIP_WRAPPER_FINDHIP_DIR}/${file_name}) endforeach() + unset(config_files) endfunction()