diff --git a/sycl/plugins/CMakeLists.txt b/sycl/plugins/CMakeLists.txt index 7ec6ee74071d4..f37f4f25ca46d 100644 --- a/sycl/plugins/CMakeLists.txt +++ b/sycl/plugins/CMakeLists.txt @@ -2,10 +2,15 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang|IntelLLVM" ) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-covered-switch-default") endif() -# level_zero plugin depends today on unified_runtime plugin +# level_zero, cuda, hip, and native_cpu plugins depends today on unified_runtime plugin # and unified_runtime plugin is not an independent plugin, adding it explicitly -if ("level_zero" IN_LIST SYCL_ENABLE_PLUGINS) - add_subdirectory(unified_runtime) +if (NOT "unified_runtime" IN_LIST SYCL_ENABLE_PLUGINS) + if ("level_zero" IN_LIST SYCL_ENABLE_PLUGINS OR + "hip" IN_LIST SYCL_ENABLE_PLUGINS OR + "cuda" IN_LIST SYCL_ENABLE_PLUGINS OR + "native_cpu" IN_LIST SYCL_ENABLE_PLUGINS) + add_subdirectory(unified_runtime) + endif() endif() foreach(plugin ${SYCL_ENABLE_PLUGINS}) diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt index c5bbb404c56f9..c52a8e1ebbc0e 100644 --- a/sycl/plugins/unified_runtime/CMakeLists.txt +++ b/sycl/plugins/unified_runtime/CMakeLists.txt @@ -75,7 +75,6 @@ add_sycl_plugin(unified_runtime Threads::Threads UnifiedRuntimeLoader UnifiedRuntime-Headers - LevelZeroLoader-Headers # we need for #include in common.h ) add_dependencies(sycl-runtime-libraries ur_adapter_level_zero) @@ -268,9 +267,3 @@ if (TARGET UnifiedRuntimeLoader) ) endif() -# Install the UR adapters too -install(TARGETS ur_adapter_level_zero - LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT level-zero-sycl-dev - ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT level-zero-sycl-dev - RUNTIME DESTINATION "bin" COMPONENT level-zero-sycl-dev -)