Revert "Link zello samples to ze_loader"

This reverts commit d0e1d5cffb.

Change-Id: Id66620e50e770492e4fa99e734eaf2b39729210f
This commit is contained in:
Jaime Arteaga
2020-09-29 10:14:16 -07:00
parent deb4cc2444
commit 3015b95752
2 changed files with 13 additions and 8 deletions

View File

@@ -21,11 +21,16 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
VS_DEBUGGER_WORKING_DIRECTORY "$(OutputPath)"
)
find_library(ZE_LOADER ze_loader)
if(ZE_LOADER)
target_link_libraries(${TEST_NAME} ze_loader)
if(MSVC)
add_dependencies(${TEST_NAME} ${TARGET_NAME_L0})
target_link_libraries(${TEST_NAME} PUBLIC ${TARGET_NAME_L0})
else()
set_target_properties(${TEST_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE)
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()
endif()
set_target_properties(${TEST_NAME} PROPERTIES FOLDER ${L0_BLACK_BOX_TEST_PROJECT_FOLDER})
endforeach()

View File

@@ -21,11 +21,11 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
VS_DEBUGGER_WORKING_DIRECTORY "$(OutputPath)"
)
find_library(ZE_LOADER ze_loader)
if(ZE_LOADER)
target_link_libraries(${TEST_NAME} ze_loader)
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)
target_link_libraries(${TEST_NAME} PUBLIC ${TARGET_NAME_L0})
endif()
set_target_properties(${TEST_NAME} PROPERTIES FOLDER ${L0_BLACK_BOX_TEST_PROJECT_FOLDER})
endforeach()