From 7ce2befe4280fd20c1f14a5cef80db4068bcb2b8 Mon Sep 17 00:00:00 2001
From: Frank Schlimbach <frank.schlimbach@intel.com>
Date: Wed, 17 Apr 2024 09:53:30 +0200
Subject: [PATCH] no patching of findSycl

---
 conda-recipe/build.sh            |  1 -
 conda-recipe/imex_findsycl.patch | 40 --------------------------------
 2 files changed, 41 deletions(-)
 delete mode 100644 conda-recipe/imex_findsycl.patch

diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh
index c751b06..92a3fa0 100644
--- a/conda-recipe/build.sh
+++ b/conda-recipe/build.sh
@@ -59,7 +59,6 @@ if [ ! -d "${INSTALLED_DIR}/imex/lib" ]; then
     git reset --hard HEAD
     git fetch --prune
     git checkout $IMEX_SHA
-    git apply ${RECIPE_DIR}/imex_*.patch
     LLVM_SHA=$(cat build_tools/llvm_version.txt)
     # if [ ! -d "llvm-project" ]; then ln -s ~/github/llvm-project .; fi
     if [ ! -d "llvm-project" ]; then
diff --git a/conda-recipe/imex_findsycl.patch b/conda-recipe/imex_findsycl.patch
deleted file mode 100644
index b94d070..0000000
--- a/conda-recipe/imex_findsycl.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/cmake/modules/FindSyclRuntime.cmake b/cmake/modules/FindSyclRuntime.cmake
-index 0eefdf6d..8d8fbd62 100644
---- a/cmake/modules/FindSyclRuntime.cmake
-+++ b/cmake/modules/FindSyclRuntime.cmake
-@@ -27,20 +27,26 @@
- 
- include(FindPackageHandleStandardArgs)
- 
--if(NOT DEFINED ENV{CMPLR_ROOT})
-+if(NOT DEFINED ENV{CMPLR_ROOT} AND NOT DEFINED ENV{SYCL_DIR})
-     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")
-+    message(Warning "Alternatively, you can set environment SYCL_DIR to the install dir of SYCL")
- else()
--    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()
-+    if(DEFINED ENV{SYCL_DIR})
-+        set(SyclRuntime_ROOT "$ENV{SYCL_DIR}")
-     else()
--        set(SyclRuntime_ROOT "$ENV{CMPLR_ROOT}")
-+        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()
-     endif()
-+
-     list(APPEND SyclRuntime_INCLUDE_DIRS "${SyclRuntime_ROOT}/include")
-     list(APPEND SyclRuntime_INCLUDE_DIRS "${SyclRuntime_ROOT}/include/sycl")
-