Hopefully, final fixes to see CI pass

Author: AlexeySachkov

sycl/source/detail/platform_impl.hpp

@@ -10,6 +10,7 @@
 
 #include <detail/adapter.hpp>
 #include <detail/platform_info.hpp>
+#include <detail/ur.hpp>
 #include <detail/ur_info_code.hpp>
 #include <sycl/backend_types.hpp>
 #include <sycl/detail/cl.h>

sycl/test/CMakeLists.txt

@@ -15,7 +15,6 @@ set(SYCL_THREADS_LIB ${CMAKE_THREAD_LIBS_INIT})
 
 # TEST_INCLUDE_PATH is used for syntax-only verification of type information.
 list(APPEND test_includes ${SYCL_INCLUDE})
-list(APPEND test_includes ${SYCL_INCLUDE}/sycl)
 list(APPEND test_includes ${SYCL_SOURCE_DIR}/source)
 list(APPEND test_includes ${BOOST_UNORDERED_INCLUDE_DIRS})
 if(SYCL_ENABLE_EXTENSION_JIT)

sycl/test/basic_tests/interop-backend-traits-cuda.cpp

@@ -5,6 +5,7 @@
 #ifdef USE_CUDA_EXPERIMENTAL
 #define SYCL_EXT_ONEAPI_BACKEND_CUDA 1
 #define SYCL_EXT_ONEAPI_BACKEND_CUDA_EXPERIMENTAL 1
+#include <sycl/backend.hpp>
 #include <sycl/ext/oneapi/experimental/backend/cuda.hpp>
 #endif
 

sycl/test/basic_tests/interop-cuda.cpp

@@ -10,6 +10,7 @@
 
 #ifdef SYCL_EXT_ONEAPI_BACKEND_CUDA_EXPERIMENTAL
 // expected-no-diagnostics
+#include <sycl/backend.hpp>
 #include <sycl/ext/oneapi/experimental/backend/cuda.hpp>
 #endif