Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

properly link with instrumentation_umd

Browse Source 
Linking is required for igdrcl_dll target only. Not needed for static
library. This reduces scope of targets where library is required.

Change-Id: Ie48ce1f299ef9d4e484081fe87254869c72ca042
This commit is contained in:
Artur Harasimiuk
2018-02-19 08:30:17 +01:00
parent 261a2ee865
commit 67c8d7a9ca
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
runtime/CMakeLists.txt
View File

@ -307,10 +307,6 @@ if(NOT GMMUMD_LIB_NAME)
endif() endif()
target_link_libraries(${NEO_STATIC_LIB_NAME} ${GMMUMD_LIB_NAME}) target_link_libraries(${NEO_STATIC_LIB_NAME} ${GMMUMD_LIB_NAME})
if(HAVE_INSTRUMENTATION)
target_link_libraries(${NEO_STATIC_LIB_NAME} instrumentation_umd)
endif()
if(WIN32) if(WIN32)
if(GTPIN_HEADERS_DIR) if(GTPIN_HEADERS_DIR)
set( DEF_FILE "${CMAKE_CURRENT_SOURCE_DIR}/dll/windows/GTPinExports${IGDRCL_OPTION__BITS}.def" ) set( DEF_FILE "${CMAKE_CURRENT_SOURCE_DIR}/dll/windows/GTPinExports${IGDRCL_OPTION__BITS}.def" )
@ -376,20 +372,24 @@ if(${GENERATE_EXECUTABLE})
endforeach(GEN_NUM) endforeach(GEN_NUM)
endif(GTPIN_HEADERS_DIR) endif(GTPIN_HEADERS_DIR)
add_library(${NEO_DYNAMIC_LIB_NAME} SHARED add_library(${NEO_DYNAMIC_LIB_NAME} SHARED
${RUNTIME_SRCS_DLL} ${RUNTIME_SRCS_DLL}
$<TARGET_OBJECTS:${SHARINGS_ENABLE_LIB_NAME}> $<TARGET_OBJECTS:${SHARINGS_ENABLE_LIB_NAME}>
$<TARGET_OBJECTS:${BUILTINS_SOURCES_LIB_NAME}> $<TARGET_OBJECTS:${BUILTINS_SOURCES_LIB_NAME}>
$<TARGET_OBJECTS:${BUILTINS_BINARIES_LIB_NAME}> $<TARGET_OBJECTS:${BUILTINS_BINARIES_LIB_NAME}>
$<TARGET_OBJECTS:${SCHEDULER_BINARY_LIB_NAME}> $<TARGET_OBJECTS:${SCHEDULER_BINARY_LIB_NAME}>
) )
target_include_directories(${NEO_DYNAMIC_LIB_NAME} BEFORE PRIVATE target_include_directories(${NEO_DYNAMIC_LIB_NAME} BEFORE PRIVATE
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${HW_SRC_INCLUDE_PATH} ${HW_SRC_INCLUDE_PATH}
) )
target_link_libraries(${NEO_DYNAMIC_LIB_NAME} ${NEO_STATIC_LIB_NAME}) target_link_libraries(${NEO_DYNAMIC_LIB_NAME} ${NEO_STATIC_LIB_NAME})
if(HAVE_INSTRUMENTATION)
target_link_libraries(${NEO_DYNAMIC_LIB_NAME} instrumentation_umd)
endif()
if (WIN32) if (WIN32)
target_include_directories(${NEO_DYNAMIC_LIB_NAME} PUBLIC target_include_directories(${NEO_DYNAMIC_LIB_NAME} PUBLIC

4
unit_tests/CMakeLists.txt
View File

@ -253,8 +253,8 @@ else()
${IGDRCL_SOURCE_DIR}/unit_tests/mocks/mock_gmm_resource_info.cpp ${IGDRCL_SOURCE_DIR}/unit_tests/mocks/mock_gmm_resource_info.cpp
${IGDRCL_SOURCE_DIR}/unit_tests/program/evaluate_unhandled_token_ult.cpp ${IGDRCL_SOURCE_DIR}/unit_tests/program/evaluate_unhandled_token_ult.cpp
) )
target_link_libraries(igdrcl_linux gtest gmock ${NEO_MOCKABLE_LIB_NAME} dl pthread) target_link_libraries(igdrcl_linux gtest gmock ${NEO_MOCKABLE_LIB_NAME} dl pthread igdrcl_mocks)
target_link_libraries(igdrcl_linux_dll_tests gtest gmock ${NEO_MOCKABLE_LIB_NAME} dl pthread) target_link_libraries(igdrcl_linux_dll_tests gtest gmock ${NEO_MOCKABLE_LIB_NAME} dl pthread igdrcl_mocks)
target_link_libraries(igdrcl_tests dl pthread gtest gmock) target_link_libraries(igdrcl_tests dl pthread gtest gmock)
set_property(TARGET igdrcl_linux_dll_tests APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS}) set_property(TARGET igdrcl_linux_dll_tests APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS})

2
unit_tests/tbx/CMakeLists.txt
View File

@ -32,7 +32,7 @@ add_executable(igdrcl_tbx_tests
$<TARGET_OBJECTS:igdrcl_libult> $<TARGET_OBJECTS:igdrcl_libult>
) )
add_dependencies(igdrcl_tbx_tests gtest gmock) add_dependencies(igdrcl_tbx_tests gtest gmock)
target_link_libraries(igdrcl_tbx_tests ${NEO_MOCKABLE_LIB_NAME} gtest gmock) target_link_libraries(igdrcl_tbx_tests ${NEO_MOCKABLE_LIB_NAME} gtest gmock igdrcl_mocks)
target_compile_definitions(igdrcl_tbx_tests PRIVATE MOCKABLE_VIRTUAL=virtual) target_compile_definitions(igdrcl_tbx_tests PRIVATE MOCKABLE_VIRTUAL=virtual)
if(UNIX) if(UNIX)
target_link_libraries(igdrcl_tbx_tests dl pthread) target_link_libraries(igdrcl_tbx_tests dl pthread)