From 45301cf878969e2036aca404322b54bfebd782f3 Mon Sep 17 00:00:00 2001 From: "Lee, Sang Ik" Date: Wed, 13 Dec 2023 10:34:51 -0800 Subject: [PATCH] Fix FindSyclRuntime.cmake Oneapi compiler changed directory structure in 2024.0 --- cmake/modules/FindSyclRuntime.cmake | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/cmake/modules/FindSyclRuntime.cmake b/cmake/modules/FindSyclRuntime.cmake index 23948d6ab..0eefdf6dc 100644 --- a/cmake/modules/FindSyclRuntime.cmake +++ b/cmake/modules/FindSyclRuntime.cmake @@ -31,10 +31,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")