diff --git a/projects/hipblas/clients/CMakeLists.txt b/projects/hipblas/clients/CMakeLists.txt
index 3b5eb5bd78e..a230135a102 100644
--- a/projects/hipblas/clients/CMakeLists.txt
+++ b/projects/hipblas/clients/CMakeLists.txt
@@ -59,14 +59,14 @@ function( get_cblas cblas_libs cblas_inc )
 endfunction( )
 
 function( apply_omp_settings lib_target_ )
-  if (TARGET OpenMP::OpenMP_CXX)
+  if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND TARGET OpenMP::OpenMP_CXX)
     set_target_properties( ${lib_target_} PROPERTIES
       BUILD_RPATH "${HIP_CLANG_ROOT}/lib"
     )
     set_target_properties( ${lib_target_} PROPERTIES
       INSTALL_RPATH "$ORIGIN/../llvm/lib"
     )
-  elseif(TARGET OpenMP::omp)
+  elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND TARGET OpenMP::omp)
     set_target_properties( ${lib_target_} PROPERTIES
       BUILD_RPATH "${HIP_CLANG_ROOT}/${openmp_LIB_DIR}"
     )
@@ -133,10 +133,12 @@ if( BUILD_CLIENTS_BENCHMARKS OR BUILD_CLIENTS_TESTS)
   set(THREADS_PREFER_PTHREAD_FLAG ON)
   find_package(Threads REQUIRED)
 
-  # Look for openmp config in ROCm install to populate openmp_LIB_DIR and openmp_LIB_INSTALL_DIR
-  find_package(OpenMP CONFIG PATHS "${HIP_CLANG_ROOT}/lib/cmake")
+  if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    # Look for openmp config in ROCm install to populate openmp_LIB_DIR and openmp_LIB_INSTALL_DIR
+    find_package(OpenMP CONFIG PATHS "${HIP_CLANG_ROOT}/lib/cmake")
+  endif()
 
-  if (TARGET OpenMP::omp)
+  if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND TARGET OpenMP::omp)
     set( COMMON_LINK_LIBS "OpenMP::omp")
     message(STATUS "Found openmp-config.cmake at ${OpenMP_DIR}")
   else()
@@ -145,14 +147,6 @@ if( BUILD_CLIENTS_BENCHMARKS OR BUILD_CLIENTS_TESTS)
     find_package(OpenMP)
     if (TARGET OpenMP::OpenMP_CXX)
       set( COMMON_LINK_LIBS "OpenMP::OpenMP_CXX")
-      if(HIP_PLATFORM STREQUAL amd)
-        list( APPEND COMMON_LINK_LIBS "-L\"${HIP_CLANG_ROOT}/lib\"")
-        if (NOT WIN32)
-          list( APPEND COMMON_LINK_LIBS "-lomp")
-        else()
-          list( APPEND COMMON_LINK_LIBS "libomp")
-        endif()
-      endif()
     endif()
   endif()