diff --git a/level_zero/core/test/black_box_tests/CMakeLists.txt b/level_zero/core/test/black_box_tests/CMakeLists.txt index f0e418ba09..129f490489 100644 --- a/level_zero/core/test/black_box_tests/CMakeLists.txt +++ b/level_zero/core/test/black_box_tests/CMakeLists.txt @@ -21,16 +21,11 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") VS_DEBUGGER_WORKING_DIRECTORY "$(OutputPath)" ) - if(MSVC) - add_dependencies(${TEST_NAME} ${TARGET_NAME_L0}) - target_link_libraries(${TEST_NAME} PUBLIC ${TARGET_NAME_L0}) + find_library(ZE_LOADER ze_loader) + if(ZE_LOADER) + target_link_libraries(${TEST_NAME} ze_loader) else() - if(BUILD_LEVEL_ZERO_LOADER) - add_dependencies(${TEST_NAME} ze_loader) - target_link_libraries(${TEST_NAME} ${NEO_BINARY_DIR}/lib/libze_loader.so) - else() - set_target_properties(${TEST_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE) - endif() + set_target_properties(${TEST_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE) endif() set_target_properties(${TEST_NAME} PROPERTIES FOLDER ${L0_BLACK_BOX_TEST_PROJECT_FOLDER}) endforeach() diff --git a/level_zero/tools/test/black_box_tests/CMakeLists.txt b/level_zero/tools/test/black_box_tests/CMakeLists.txt index b853d88af0..021abf80c0 100644 --- a/level_zero/tools/test/black_box_tests/CMakeLists.txt +++ b/level_zero/tools/test/black_box_tests/CMakeLists.txt @@ -21,11 +21,11 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") VS_DEBUGGER_WORKING_DIRECTORY "$(OutputPath)" ) - if(BUILD_LEVEL_ZERO_LOADER) - add_dependencies(${TEST_NAME} ze_loader) - target_link_libraries(${TEST_NAME} ${NEO_BINARY_DIR}/lib/libze_loader.so) + find_library(ZE_LOADER ze_loader) + if(ZE_LOADER) + target_link_libraries(${TEST_NAME} ze_loader) else() - target_link_libraries(${TEST_NAME} PUBLIC ${TARGET_NAME_L0}) + set_target_properties(${TEST_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE) endif() set_target_properties(${TEST_NAME} PROPERTIES FOLDER ${L0_BLACK_BOX_TEST_PROJECT_FOLDER}) endforeach()