Skip to content

Commit 3015b95

Browse files
author
Jaime Arteaga
committed
Revert "Link zello samples to ze_loader"
This reverts commit d0e1d5c. Change-Id: Id66620e50e770492e4fa99e734eaf2b39729210f
1 parent deb4cc2 commit 3015b95

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

level_zero/core/test/black_box_tests/CMakeLists.txt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,16 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
2121
VS_DEBUGGER_WORKING_DIRECTORY "$(OutputPath)"
2222
)
2323

24-
find_library(ZE_LOADER ze_loader)
25-
if(ZE_LOADER)
26-
target_link_libraries(${TEST_NAME} ze_loader)
24+
if(MSVC)
25+
add_dependencies(${TEST_NAME} ${TARGET_NAME_L0})
26+
target_link_libraries(${TEST_NAME} PUBLIC ${TARGET_NAME_L0})
2727
else()
28-
set_target_properties(${TEST_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE)
28+
if(BUILD_LEVEL_ZERO_LOADER)
29+
add_dependencies(${TEST_NAME} ze_loader)
30+
target_link_libraries(${TEST_NAME} ${NEO_BINARY_DIR}/lib/libze_loader.so)
31+
else()
32+
set_target_properties(${TEST_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE)
33+
endif()
2934
endif()
3035
set_target_properties(${TEST_NAME} PROPERTIES FOLDER ${L0_BLACK_BOX_TEST_PROJECT_FOLDER})
3136
endforeach()

level_zero/tools/test/black_box_tests/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
2121
VS_DEBUGGER_WORKING_DIRECTORY "$(OutputPath)"
2222
)
2323

24-
find_library(ZE_LOADER ze_loader)
25-
if(ZE_LOADER)
26-
target_link_libraries(${TEST_NAME} ze_loader)
24+
if(BUILD_LEVEL_ZERO_LOADER)
25+
add_dependencies(${TEST_NAME} ze_loader)
26+
target_link_libraries(${TEST_NAME} ${NEO_BINARY_DIR}/lib/libze_loader.so)
2727
else()
28-
set_target_properties(${TEST_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE)
28+
target_link_libraries(${TEST_NAME} PUBLIC ${TARGET_NAME_L0})
2929
endif()
3030
set_target_properties(${TEST_NAME} PROPERTIES FOLDER ${L0_BLACK_BOX_TEST_PROJECT_FOLDER})
3131
endforeach()

0 commit comments

Comments
 (0)