From 0468340d03580dae23a9cf07b64e708729cb4432 Mon Sep 17 00:00:00 2001 From: "systems-assistant[bot]" <221163467+systems-assistant[bot]@users.noreply.github.com> Date: Tue, 2 Sep 2025 15:15:26 +0100 Subject: [PATCH] SWDEV-524815 - Specify path to hipconfig.exe instead of hipconfig on windows (#421) Co-authored-by: Ioannis Assiouras --- projects/hip/cmake/FindHIP.cmake | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/projects/hip/cmake/FindHIP.cmake b/projects/hip/cmake/FindHIP.cmake index 422b708917..dfc0c812ce 100644 --- a/projects/hip/cmake/FindHIP.cmake +++ b/projects/hip/cmake/FindHIP.cmake @@ -97,9 +97,14 @@ if(NOT APPLE) # Search for HIP installation if(NOT HIP_ROOT_DIR) # Search in user specified path first + if(WIN32) + set(HIPCONFIG_EXE_NAME bin/hipconfig.exe) + else() + set(HIPCONFIG_EXE_NAME bin/hipconfig) + endif() find_path( HIP_ROOT_DIR - NAMES bin/hipconfig + NAMES ${HIPCONFIG_EXE_NAME} PATHS "$ENV{ROCM_PATH}" "$ENV{ROCM_PATH}/hip" @@ -150,13 +155,6 @@ if(NOT APPLE) # Now search in default paths find_program(HIP_HIPCONFIG_EXECUTABLE hipconfig) endif() - if(NOT UNIX) - get_filename_component(HIPCONFIG_EXECUTABLE_EXT ${HIP_HIPCONFIG_EXECUTABLE} EXT) - if(NOT HIPCONFIG_EXECUTABLE_EXT STREQUAL ".bat") - set(HIP_HIPCONFIG_EXECUTABLE "${HIP_HIPCONFIG_EXECUTABLE}.bat") - set(HIP_HIPCC_EXECUTABLE "${HIP_HIPCC_EXECUTABLE}.bat") - endif() - endif() mark_as_advanced(HIP_HIPCONFIG_EXECUTABLE) mark_as_advanced(HIP_HIPCC_EXECUTABLE)