diff --git a/projects/clr/CMakeLists.txt b/projects/clr/CMakeLists.txt
index ef0666a2d5..cc9cf16542 100644
--- a/projects/clr/CMakeLists.txt
+++ b/projects/clr/CMakeLists.txt
@@ -41,13 +41,21 @@ endif()
 # Build steps
 #############
 if(CLR_BUILD_HIP)
+  if (UNIX)
+    set(HIPCC_EXECUTABLE "hipcc")
+    set(HIPCONFIG_EXECUTABLE "hipconfig")
+  else()
+    set(HIPCC_EXECUTABLE "hipcc.exe")
+    set(HIPCONFIG_EXECUTABLE "hipconfig.exe")
+  endif()
+
     # Set default HIPCC_BIN_DIR to /opt/rocm/bin
     if(NOT DEFINED HIPCC_BIN_DIR AND UNIX)
         set(HIPCC_BIN_DIR "/opt/rocm/bin" CACHE STRING "Default hipcc directory on linux.")
     endif()
     message(STATUS "HIPCC Binary Directory: ${HIPCC_BIN_DIR}")
 
-    if(NOT EXISTS ${HIPCC_BIN_DIR}/hipconfig)
+    if(NOT EXISTS ${HIPCC_BIN_DIR}/${HIPCONFIG_EXECUTABLE})
         message(FATAL_ERROR "Please pass hipcc/build or hipcc/bin using -DHIPCC_BIN_DIR.")
     endif()
 
@@ -56,10 +64,9 @@ if(CLR_BUILD_HIP)
         message(FATAL_ERROR "Please pass HIP using -DHIP_COMMON_DIR. HIP_COMMON_DIR is incorrect")
     endif()
     # Determine HIP_PLATFORM
-    set(__HIPCONFIG_EXECUTABLE__ ${HIPCC_BIN_DIR}/hipconfig)
     if(NOT DEFINED HIP_PLATFORM)
         if(NOT DEFINED ENV{HIP_PLATFORM})
-            execute_process(COMMAND ${__HIPCONFIG_EXECUTABLE__} --platform
+            execute_process(COMMAND ${HIPCC_BIN_DIR}/${HIPCONFIG_EXECUTABLE} --platform
                 OUTPUT_VARIABLE HIP_PLATFORM
                 OUTPUT_STRIP_TRAILING_WHITESPACE)
         else()
diff --git a/projects/clr/hipamd/CMakeLists.txt b/projects/clr/hipamd/CMakeLists.txt
index 39e59b4548..f0c6d7f918 100755
--- a/projects/clr/hipamd/CMakeLists.txt
+++ b/projects/clr/hipamd/CMakeLists.txt
@@ -66,7 +66,13 @@ message(STATUS "HIP_COMMON_DIR found at ${HIP_COMMON_DIR}")
 message(STATUS "HIPNV_DIR found at ${HIPNV_DIR}")
 set(HIP_COMMON_INCLUDE_DIR ${HIP_COMMON_DIR}/include)
 set(HIP_COMMON_BIN_DIR ${HIP_COMMON_DIR}/bin)
-set(__HIPCONFIG_EXECUTABLE__ ${HIP_COMMON_DIR}/bin/hipconfig)
+if (WIN32)
+  set(HIPCC_EXECUTABLE "hipcc.exe")
+  set(HIPCONFIG_EXECUTABLE "hipconfig.exe")
+else()
+  set(HIPCC_EXECUTABLE "hipcc")
+  set(HIPCONFIG_EXECUTABLE "hipconfig")
+endif()
 
 #############################
 # Setup config generation
@@ -390,25 +396,16 @@ install(FILES ${PROJECT_BINARY_DIR}/include/hip/hip_version.h
 if (NOT ${HIPCC_BIN_DIR} STREQUAL "")
   file(TO_CMAKE_PATH "${HIPCC_BIN_DIR}" HIPCC_BIN_DIR)
   if(EXISTS ${HIPCC_BIN_DIR})
-    set(hipcc_bin ${HIPCC_BIN_DIR}/hipcc.bin)
-    set(hipconfig_bin ${HIPCC_BIN_DIR}/hipconfig.bin)
-    if(WIN32)
-      set(hipcc_bin ${hipcc_bin}.exe)
-      set(hipconfig_bin ${hipconfig_bin}.exe)
+    install(PROGRAMS ${HIPCC_BIN_DIR}/${HIPCC_EXECUTABLE} DESTINATION bin)
+    install(PROGRAMS ${HIPCC_BIN_DIR}/${HIPCONFIG_EXECUTABLE} DESTINATION bin)
+    install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.pl DESTINATION bin)
+    install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.pl DESTINATION bin)
+    install(PROGRAMS ${HIPCC_BIN_DIR}/hipvars.pm DESTINATION bin)
+
+    if(NOT UNIX)
+      install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.bat DESTINATION bin)
+      install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.bat DESTINATION bin)
     endif()
-    if(EXISTS ${hipcc_bin} AND EXISTS ${hipconfig_bin})
-      install(PROGRAMS ${hipcc_bin} DESTINATION bin)
-      install(PROGRAMS ${hipconfig_bin} DESTINATION bin)
-    endif()
-  endif()
-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc DESTINATION bin)
-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig DESTINATION bin)
-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.pl DESTINATION bin)
-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.pl DESTINATION bin)
-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipvars.pm DESTINATION bin)
-  if(WIN32)
-    install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.bat DESTINATION bin)
-    install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.bat DESTINATION bin)
   endif()
 endif()
 
diff --git a/projects/clr/hipamd/hip-config.cmake.in b/projects/clr/hipamd/hip-config.cmake.in
index 8b63fdc8bb..1fcdcd970e 100755
--- a/projects/clr/hipamd/hip-config.cmake.in
+++ b/projects/clr/hipamd/hip-config.cmake.in
@@ -101,9 +101,9 @@ set_and_check( hip_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@" )
 set_and_check( hip_INCLUDE_DIRS "${hip_INCLUDE_DIR}" )
 set_and_check( hip_LIB_INSTALL_DIR "@PACKAGE_LIB_INSTALL_DIR@" )
 set_and_check( hip_BIN_INSTALL_DIR "@PACKAGE_BIN_INSTALL_DIR@" )
-if(WIN32)
-  set_and_check(hip_HIPCC_EXECUTABLE "${hip_BIN_INSTALL_DIR}/hipcc.bat")
-  set_and_check(hip_HIPCONFIG_EXECUTABLE "${hip_BIN_INSTALL_DIR}/hipconfig.bat")
+if (WIN32)
+  set_and_check(hip_HIPCC_EXECUTABLE "${hip_BIN_INSTALL_DIR}/hipcc.exe")
+  set_and_check(hip_HIPCONFIG_EXECUTABLE "${hip_BIN_INSTALL_DIR}/hipconfig.exe")
 else()
   set_and_check(hip_HIPCC_EXECUTABLE "${hip_BIN_INSTALL_DIR}/hipcc")
   set_and_check(hip_HIPCONFIG_EXECUTABLE "${hip_BIN_INSTALL_DIR}/hipconfig")