Cleanup cross component dependencies

dont link opencl lib to non-opencl targets
link compute_runtime_mockable_extra only to l0 targets
reuse include paths and definitions from neo_shared lib

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2021-10-25 08:00:23 +00:00
committed by Compute-Runtime-Automation
parent 71ed3eba16
commit 260997ccd1
19 changed files with 39 additions and 67 deletions

View File

@@ -48,7 +48,6 @@ target_sources(${TARGET_NAME} PRIVATE
)
target_sources(${TARGET_NAME} PRIVATE
${NEO_SHARED_TEST_DIRECTORY}/common/libult/os_interface.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/ult_device_factory.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/ult_device_factory.h
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_gmm_client_context.cpp
@@ -95,10 +94,10 @@ endif()
copy_gmm_dll_for(${TARGET_NAME})
add_subdirectories()
target_link_libraries(${TARGET_NAME} ${NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE})
target_link_libraries(${TARGET_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME})
target_link_libraries(${TARGET_NAME} ${HW_LIBS_ULT})
target_link_libraries(${TARGET_NAME} gmock-gtest)
target_link_libraries(${TARGET_NAME} ${IGDRCL_EXTRA_LIBS})
target_link_libraries(${TARGET_NAME} ${NEO_EXTRA_LIBS})
if(UNIX)
target_link_libraries(${TARGET_NAME} rt)

View File

@@ -86,7 +86,7 @@ else()
endif()
target_link_libraries(${TARGET_NAME}
${NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE}
${NEO_SHARED_MOCKABLE_LIB_NAME}
compute_runtime_mockable_extra
${HW_LIBS_ULT}
gmock-gtest