diff --git a/mlir/cmake/modules/FindSyclRuntime.cmake b/mlir/cmake/modules/FindSyclRuntime.cmake
index 38b065a3f284c..9e6ae04025848 100644
--- a/mlir/cmake/modules/FindSyclRuntime.cmake
+++ b/mlir/cmake/modules/FindSyclRuntime.cmake
@@ -17,10 +17,15 @@ if(NOT DEFINED ENV{CMPLR_ROOT})
     message(WARNING "Please make sure to install Intel DPC++ Compiler and run setvars.(sh/bat)")
     message(WARNING "You can download standalone Intel DPC++ Compiler from https://www.intel.com/content/www/us/en/developer/articles/tool/oneapi-standalone-components.html#compilers")
 else()
-    if(LINUX OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux"))
-        set(SyclRuntime_ROOT "$ENV{CMPLR_ROOT}/linux")
-    elseif(WIN32)
-        set(SyclRuntime_ROOT "$ENV{CMPLR_ROOT}/windows")
+    get_filename_component(ONEAPI_VER "$ENV{CMPLR_ROOT}" NAME)
+    if(ONEAPI_VER VERSION_LESS 2024.0)
+        if(LINUX OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux"))
+            set(SyclRuntime_ROOT "$ENV{CMPLR_ROOT}/linux")
+        elseif(WIN32)
+            set(SyclRuntime_ROOT "$ENV{CMPLR_ROOT}/windows")
+        endif()
+    else()
+        set(SyclRuntime_ROOT "$ENV{CMPLR_ROOT}")
     endif()
     list(APPEND SyclRuntime_INCLUDE_DIRS "${SyclRuntime_ROOT}/include")
     list(APPEND SyclRuntime_INCLUDE_DIRS "${SyclRuntime_ROOT}/include/sycl")