Apply remaining comments

Author: AlexeySachkov

sycl/CMakeLists.txt

@@ -189,7 +189,7 @@ set(SYCL_EXT_ONEAPI_BACKEND_HIP ${LLVM_HAS_AMDGPU_TARGET})
 
 # Configure SYCL version macro
 set(SYCL_ROOT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-set(sycl_src_dir ${CMAKE_CURRENT_SOURCE_DIR}/source)
+set(sycl_src_dir ${SYCL_ROOT_SOURCE_DIR}/source)
 include(SYCLVersionFromVCS)
 configure_file("source/feature_test.hpp.in" "${SYCL_INCLUDE_BUILD_DIR}/sycl/feature_test.hpp")
 
@@ -216,7 +216,7 @@ install(FILES
 include(AddBoostMp11Headers)
 include(FetchBoostUnorderedHeaders)
 
-set(sycl_inc_dir ${CMAKE_CURRENT_SOURCE_DIR}/include)
+set(sycl_inc_dir ${SYCL_ROOT_SOURCE_DIR}/include)
 # This is workaround to detect changes (add or modify) in subtree which
 # are not detected by copy_directory command.
 # TODO: detect and process remove header/directory case

sycl/test/warnings/sycl-compiler-version-cl.cpp

@@ -7,7 +7,4 @@
 
 // CHECK: '__SYCL_COMPILER_VERSION': name was marked as #pragma deprecated
 #if __SYCL_COMPILER_VERSION >= 2024
-
 #endif
-
-int main() {}

sycl/test/warnings/sycl-compiler-version-clang.cpp

@@ -4,7 +4,4 @@
 
 // expected-warning@+1 {{__SYCL_COMPILER_VERSION is deprecated, use __LIBSYCL_TIMESTAMP instead}}
 #if __SYCL_COMPILER_VERSION >= 2024
-
 #endif
-
-int main() {}

sycl/test/warnings/sycl-compiler-version-gcc.cpp

@@ -1,13 +1,12 @@
 // RUN: %clangxx -fsycl -fsycl-host-compiler=g++ %s -c %t.out | FileCheck %s
 // XFAIL: *
-// XFAIL-TRACKER: TBD
+// It seems like gcc doesn't properly support _Pragma directive as its own
+// documentation says. Therefore, for gcc as host compiler we don't currently
+// emit a deprecation warning.
 // REQUIRES: linux
 
 #include <sycl/sycl.hpp>
 
 // CHECK: __SYCL_COMPILER_VERSION is deprecated, use __LIBSYCL_TIMESTAMP instead
 #if __SYCL_COMPILER_VERSION >= 2024
-
 #endif
-
-int main() {}