[Mlir-commits] [mlir] 8197ea2 - [MLIR] Update FindSyclRuntime.cmake to handle SYCL library path chang… (#75861)

[llvmlistbot at llvm.org]

Author: Sang Ik Lee
Date: 2023-12-19T15:55:33-06:00
New Revision: 8197ea2a08d5e6d72c7579d8cc7c228ae2dbe579

URL: https://github.com/llvm/llvm-project/commit/8197ea2a08d5e6d72c7579d8cc7c228ae2dbe579
DIFF: https://github.com/llvm/llvm-project/commit/8197ea2a08d5e6d72c7579d8cc7c228ae2dbe579.diff

LOG: [MLIR] Update FindSyclRuntime.cmake to handle SYCL library path chang… (#75861)

…e introduced by oneAPI DPC++ compiler 2024.0

Added: 
    

Modified: 
    mlir/cmake/modules/FindSyclRuntime.cmake

Removed: 
    


################################################################################
diff  --git a/mlir/cmake/modules/FindSyclRuntime.cmake b/mlir/cmake/modules/FindSyclRuntime.cmake
index 38b065a3f284c2..9e6ae040258487 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")