[SYCL][COMPAT] Fixed missing libraries when linking unittests

Author: Alcpz

sycl/cmake/modules/AddSYCLLibraryUnitTest.cmake

@@ -1,7 +1,7 @@
-# add_sycl_library_unittest(test_suite_name sycl_extra_flags 
+# add_sycl_library_unittest(test_suite_name sycl_extra_flags
 #                           file1.cpp file2.cpp ...)
 #
-# sycl_extra_flags: Clang extra compiler flags, e.g. 
+# sycl_extra_flags: Clang extra compiler flags, e.g.
 #                   "-fsycl-unnamed-lambdas;-fsycl-device-code-split"
 #
 # Will compile the list of files together using clang.
@@ -17,40 +17,34 @@ macro(add_sycl_library_unittest test_suite_name)
   set(CXX_COMPILER clang++)
   if(MSVC)
     set(CXX_COMPILER clang-cl.exe)
-    set(LIB_POSTFIX ".lib")
-  else()
-    set(LIB_PREFIX "-l")
   endif()
 
   set(DEVICE_COMPILER_EXECUTABLE ${LLVM_RUNTIME_OUTPUT_INTDIR}/${CXX_COMPILER})
   set(_OUTPUT_BIN ${CMAKE_CURRENT_BINARY_DIR}/${test_suite_name}Tests)
   set(_TESTS_TARGET ${test_suite_name}Tests)
   set(_BIN_TARGET ${_TESTS_TARGET}_bin)
-  set(_TARGET_DEPENDENCIES 
-      "llvm_gtest_main;llvm_gtest;LLVMTestingSupport;LLVMSupport;LLVMDemangle")
+  set(_LLVM_TARGET_DEPENDENCIES
+    "llvm_gtest_main;llvm_gtest;LLVMTestingSupport;LLVMSupport;LLVMDemangle")
 
-  foreach(_lib ${_TARGET_DEPENDENCIES})
-    list(APPEND _LIBRARIES $<TARGET_FILE:${_lib}>)
+  foreach(_lib ${_LLVM_TARGET_DEPENDENCIES})
+    list(APPEND _LIBRARIES $<TARGET_LINKER_FILE:${_lib}>)
   endforeach()
-  
+
   # Enable exception handling on Windows
+  # Appends extra libraries not available in LIBPATH
   if(WIN32)
+    set(_INTERNAL_LINKER_FLAGS /link /SUBSYSTEM:CONSOLE)
     list(APPEND _INTERNAL_EXTRA_FLAGS "/EHs")
-    set(LIBRARIES_PREFIX ${CMAKE_BINARY_DIR}/lib/)
-    list(APPEND _LIBRARIES $<TARGET_FILE:sycl>)
+    list(APPEND _LIBRARIES $<TARGET_LINKER_FILE:sycl>)
+    list(APPEND _LIBRARIES ${LLVM_LIBRARY_OUTPUT_INTDIR}/sycl-devicelib-host.lib)
   endif()
 
   if(UNIX)
-    foreach(_lib "pthread;dl;ncurses")
-      list(APPEND _LIBRARIES "-l${_lib}">)
+    foreach(_lib "pthread" "dl" "ncurses")
+      list(APPEND _LIBRARIES "-l${_lib}")
     endforeach()
   endif()
 
-  if (SYCL_ENABLE_COVERAGE)
-    list(APPEND _INTERNAL_EXTRA_FLAGS "-fprofile-instr-generate")
-    list(APPEND _INTERNAL_EXTRA_FLAGS "-fcoverage-mapping")
-  endif()
-
   get_target_property(GTEST_INCLUDES llvm_gtest INCLUDE_DIRECTORIES)
   foreach(_dir ${GTEST_INCLUDES})
     # Avoid -I when _dir contains an empty generator expression.
@@ -64,13 +58,14 @@ macro(add_sycl_library_unittest test_suite_name)
       ${_INTERNAL_EXTRA_FLAGS}
       ${INCLUDE_COMPILER_STRING}
       ${_LIBRARIES}
+      ${_INTERNAL_LINKER_FLAGS}
     BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/${_TESTS_TARGET}
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     COMMAND_EXPAND_LISTS)
 
   add_dependencies(${_BIN_TARGET} sycl)
   foreach(_lib ${ARG_LIBRARIES})
-      add_dependencies(${_BIN_TARGET} ${_TARGET_DEPENDENCIES})
+    add_dependencies(${_BIN_TARGET} ${_TARGET_DEPENDENCIES})
   endforeach()
 
   add_dependencies(SYCLUnitTests ${_BIN_TARGET})
@@ -79,17 +74,18 @@ macro(add_sycl_library_unittest test_suite_name)
   set_target_properties(${_TESTS_TARGET} PROPERTIES
     IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR})
 
-  # Check target (Unix Only)
-  add_custom_target(check-sycl-${test_suite_name}
-    ${CMAKE_COMMAND} -E 
-    env LD_LIBRARY_PATH="${CMAKE_BINARY_DIR}/lib"
-    env SYCL_CONFIG_FILE_NAME=null.cfg
-    env SYCL_DEVICELIB_NO_FALLBACK=1
-    env SYCL_CACHE_DIR="${CMAKE_BINARY_DIR}/sycl_cache"
-    ${CMAKE_CURRENT_BINARY_DIR}/${test_suite_name}
-  )
-  
-  add_dependencies(check-sycl-${test_suite_name} ${_BIN_TARGET})
-  add_dependencies(check-sycl-unittests-libs check-sycl-${test_suite_name})
-  
+  # Check target for Linux
+  if (UNIX)
+    add_custom_target(check-${test_suite_name}
+      ${CMAKE_COMMAND} -E
+      env LD_LIBRARY_PATH="${CMAKE_BINARY_DIR}/lib"
+      env SYCL_CONFIG_FILE_NAME=null.cfg
+      env SYCL_DEVICELIB_NO_FALLBACK=1
+      env SYCL_CACHE_DIR="${CMAKE_BINARY_DIR}/sycl_cache"
+      ${CMAKE_CURRENT_BINARY_DIR}/${_TESTS_TARGET}
+    )
+    add_dependencies(check-${test_suite_name} ${_BIN_TARGET})
+    add_dependencies(check-sycl-unittests-libs check-${test_suite_name})
+  endif()
+
 endmacro()

sycl/unittests/syclcompat/CMakeLists.txt

@@ -16,18 +16,18 @@
 
 set(SYCL_EXTRA_FLAGS "-fsycl-unnamed-lambda;-fsycl-device-code-split=per_kernel")
 
-# add_custom_target(check-sycl-syclcompat)
-# add_dependencies(check-sycl-unittests check-sycl-syclcompat)
+if (UNIX)
+  add_custom_target(check-syclcompat)
+  add_dependencies(check-sycl-unittests check-syclcompat)
+endif()
 
-# add_sycl_library_unittest(syclcompat-base 
-#   SYCL_EXTRA_FLAGS
-#     ${SYCL_EXTRA_FLAGS}
-#   SOURCES
-#     Dim.cpp
-#     Defs.cpp)
+add_sycl_library_unittest(syclcompat-base
+  SYCL_EXTRA_FLAGS
+    ${SYCL_EXTRA_FLAGS}
+  SOURCES
+    Dim.cpp
+    Defs.cpp)
 
-# add_dependencies(check-sycl-syclcompat check-sycl-syclcompat-base)
-
-add_sycl_unittest(syclcompat-baseTests OBJECT
-  Dim.cpp
-  Defs.cpp)
+if (UNIX)
+  add_dependencies(check-syclcompat check-syclcompat-base)
+endif()