Fix backslashes again

Signed-off-by: Andrew Savonichev <[email protected]>

Author: Andrew Savonichev

sycl/unittests/CMakeLists.txt

@@ -9,10 +9,16 @@ function(add_sycl_unittest test_dirname)
   # Enable exception handling for these unit tests
   set(LLVM_REQUIRES_EH 1)
 
+  if (MSVC AND CMAKE_BUILD_TYPE MATCHES "Debug")
+    set(sycl_lib "sycld")
+  else()
+    set(sycl_lib "sycl")
+  endif()
+
   add_unittest(SYCLUnitTests ${test_dirname} ${ARGN})
   target_link_libraries(${test_dirname}
     PRIVATE
-      sycl
+      ${sycl_lib}
       LLVMTestingSupport
       OpenCL-Headers
     )

sycl/unittests/misc/CMakeLists.txt

@@ -1,6 +1,4 @@
-set(CMAKE_CXX_EXTENSIONS OFF)
-
-set(sycl_lib_dir $<SHELL_PATH:$<TARGET_FILE_DIR:sycl>>)
+set(sycl_lib_dir $<TARGET_FILE_DIR:sycl>)
 add_definitions(-DSYCL_LIB_DIR="${sycl_lib_dir}")
 add_sycl_unittest(MiscTests
   OsUtils.cpp

sycl/unittests/misc/OsUtils.cpp

@@ -9,7 +9,29 @@
 #include <CL/sycl/detail/os_util.hpp>
 #include <gtest/gtest.h>
 
-#ifdef __unix__
+#ifdef _WIN32
+/// Compare for string equality, but ignore difference between forward slash (/)
+/// and backward slash (\).
+///
+/// This difference can be tricky to avoid, because CMake operates with forward
+/// slashes even on Windows, and it can be problematic to convert them when
+/// CMake generator expressions are involved. It's easier to handle slashes
+/// here in the test itself.
+bool isSameDir(const char* LHS, const char* RHS) {
+  char L = 0, R = 0;
+  do {
+    L = *LHS++;
+    R = *RHS++;
+    if (L != R) {
+      if (!((L == '\\' || L == '/') && (R == '\\' || R == '/'))) {
+        return false;
+      }
+    }
+  } while (L != '\0' && R != '\0');
+  bool SameLen = (L == '\0' && R == '\0');
+  return SameLen;
+}
+#else
 #include <sys/stat.h>
 #include <stdlib.h>
 /// Check with respect to symbolic links
@@ -27,10 +49,6 @@ bool isSameDir(const char* LHS, const char* RHS) {
   ino_t InodeRHS = StatBuf.st_ino;
   return InodeRHS == InodeLHS;
 }
-#else
-bool isSameDir(const char* LHS, const char* RHS) {
-  return 0 == strcmp(LHS, RHS);
-}
 #endif
 
 class OsUtilsTest : public ::testing::Test {