Cleanup IGC includes
- Remove IGC_COMMON_PARENT_DIR WA Signed-off-by: Igor Venevtsev <igor.venevtsev@intel.com>
This commit is contained in:
parent
be8b208a8d
commit
a3c3fe18ce
|
@ -91,10 +91,6 @@ elseif(IS_DIRECTORY "${IGC_OCL_ADAPTOR_DIR}/../../visa")
|
||||||
endif()
|
endif()
|
||||||
message(STATUS "VISA Dir: ${VISA_DIR}")
|
message(STATUS "VISA Dir: ${VISA_DIR}")
|
||||||
|
|
||||||
if(IS_DIRECTORY "${IGC_OCL_ADAPTOR_DIR}/../common")
|
|
||||||
get_filename_component(IGC_COMMON_PARENT_DIR "${IGC_OCL_ADAPTOR_DIR}/../" ABSOLUTE)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(IS_DIRECTORY "${VISA_DIR}/include")
|
if(IS_DIRECTORY "${VISA_DIR}/include")
|
||||||
set(VISA_INCLUDE_DIR "${VISA_DIR}/include")
|
set(VISA_INCLUDE_DIR "${VISA_DIR}/include")
|
||||||
else()
|
else()
|
||||||
|
|
|
@ -306,8 +306,6 @@ if(BUILD_WITH_L0)
|
||||||
${COMPUTE_RUNTIME_DEFINITIONS}
|
${COMPUTE_RUNTIME_DEFINITIONS}
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(${TARGET_NAME_L0} PRIVATE ${IGC_COMMON_PARENT_DIR})
|
|
||||||
|
|
||||||
if(UNIX)
|
if(UNIX)
|
||||||
target_include_directories(${TARGET_NAME_L0} PUBLIC
|
target_include_directories(${TARGET_NAME_L0} PUBLIC
|
||||||
${L0_ROOT_DIR}/core/source/os_interface/linux
|
${L0_ROOT_DIR}/core/source/os_interface/linux
|
||||||
|
@ -417,7 +415,6 @@ if(BUILD_WITH_L0)
|
||||||
${NEO__GMM_INCLUDE_DIR}
|
${NEO__GMM_INCLUDE_DIR}
|
||||||
${CIF_BASE_DIR}
|
${CIF_BASE_DIR}
|
||||||
${IGC_OCL_ADAPTOR_DIR}
|
${IGC_OCL_ADAPTOR_DIR}
|
||||||
${IGC_COMMON_PARENT_DIR}
|
|
||||||
${NEO__IGC_INCLUDE_DIR}
|
${NEO__IGC_INCLUDE_DIR}
|
||||||
${KHRONOS_HEADERS_DIR}
|
${KHRONOS_HEADERS_DIR}
|
||||||
)
|
)
|
||||||
|
|
|
@ -53,7 +53,6 @@ target_include_directories(${TARGET_NAME}
|
||||||
$<TARGET_PROPERTY:${TARGET_NAME_L0},SOURCE_DIR>/tools
|
$<TARGET_PROPERTY:${TARGET_NAME_L0},SOURCE_DIR>/tools
|
||||||
${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX}
|
${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX}
|
||||||
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests
|
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests
|
||||||
${IGC_COMMON_PARENT_DIR}
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
|
|
|
@ -72,7 +72,6 @@ if(NOT DISABLE_WDDM_LINUX)
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_include_directories(${NEO_DYNAMIC_LIB_NAME} PRIVATE ${IGC_COMMON_PARENT_DIR})
|
|
||||||
target_sources(${NEO_DYNAMIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_DLL_BASE})
|
target_sources(${NEO_DYNAMIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_DLL_BASE})
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
if(DEFINED NEO_DLL_RC_FILE)
|
if(DEFINED NEO_DLL_RC_FILE)
|
||||||
|
|
|
@ -42,7 +42,6 @@ function(generate_shared_lib LIB_NAME MOCKABLE)
|
||||||
${VISA_INCLUDE_DIR}
|
${VISA_INCLUDE_DIR}
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/os_interface/create_command_stream_receiver_${DRIVER_MODEL}
|
${CMAKE_CURRENT_SOURCE_DIR}/os_interface/create_command_stream_receiver_${DRIVER_MODEL}
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/direct_submission/create_direct_submission_${DRIVER_MODEL}
|
${CMAKE_CURRENT_SOURCE_DIR}/direct_submission/create_direct_submission_${DRIVER_MODEL}
|
||||||
${IGC_COMMON_PARENT_DIR}
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if(WIN32 OR NOT DISABLE_WDDM_LINUX)
|
if(WIN32 OR NOT DISABLE_WDDM_LINUX)
|
||||||
|
|
|
@ -176,7 +176,6 @@ foreach(target_name "neo_libult_common" "neo_libult")
|
||||||
$<TARGET_PROPERTY:${NEO_SHARED_MOCKABLE_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES>
|
$<TARGET_PROPERTY:${NEO_SHARED_MOCKABLE_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES>
|
||||||
$<TARGET_PROPERTY:gmock-gtest,INTERFACE_INCLUDE_DIRECTORIES>
|
$<TARGET_PROPERTY:gmock-gtest,INTERFACE_INCLUDE_DIRECTORIES>
|
||||||
${SOURCE_LEVEL_DEBUGGER_HEADERS_DIR}
|
${SOURCE_LEVEL_DEBUGGER_HEADERS_DIR}
|
||||||
${IGC_COMMON_PARENT_DIR}
|
|
||||||
)
|
)
|
||||||
target_compile_definitions(${target_name} PRIVATE $<TARGET_PROPERTY:${NEO_SHARED_MOCKABLE_LIB_NAME},INTERFACE_COMPILE_DEFINITIONS>)
|
target_compile_definitions(${target_name} PRIVATE $<TARGET_PROPERTY:${NEO_SHARED_MOCKABLE_LIB_NAME},INTERFACE_COMPILE_DEFINITIONS>)
|
||||||
create_project_source_tree(${target_name})
|
create_project_source_tree(${target_name})
|
||||||
|
|
|
@ -102,7 +102,6 @@ target_include_directories(neo_shared_mocks PRIVATE
|
||||||
$<TARGET_PROPERTY:${NEO_SHARED_MOCKABLE_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES>
|
$<TARGET_PROPERTY:${NEO_SHARED_MOCKABLE_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES>
|
||||||
$<TARGET_PROPERTY:gmock-gtest,INTERFACE_INCLUDE_DIRECTORIES>
|
$<TARGET_PROPERTY:gmock-gtest,INTERFACE_INCLUDE_DIRECTORIES>
|
||||||
${SOURCE_LEVEL_DEBUGGER_HEADERS_DIR}
|
${SOURCE_LEVEL_DEBUGGER_HEADERS_DIR}
|
||||||
${IGC_COMMON_PARENT_DIR}
|
|
||||||
)
|
)
|
||||||
target_compile_definitions(neo_shared_mocks PRIVATE $<TARGET_PROPERTY:${NEO_SHARED_MOCKABLE_LIB_NAME},INTERFACE_COMPILE_DEFINITIONS>)
|
target_compile_definitions(neo_shared_mocks PRIVATE $<TARGET_PROPERTY:${NEO_SHARED_MOCKABLE_LIB_NAME},INTERFACE_COMPILE_DEFINITIONS>)
|
||||||
create_project_source_tree(neo_shared_mocks)
|
create_project_source_tree(neo_shared_mocks)
|
||||||
|
|
|
@ -45,7 +45,6 @@ if(NOT SKIP_UNIT_TESTS)
|
||||||
${ENGINE_NODE_DIR}
|
${ENGINE_NODE_DIR}
|
||||||
${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX}
|
${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX}
|
||||||
${NEO_SHARED_TEST_DIRECTORY}/common/helpers/includes${BRANCH_DIR_SUFFIX}
|
${NEO_SHARED_TEST_DIRECTORY}/common/helpers/includes${BRANCH_DIR_SUFFIX}
|
||||||
${IGC_COMMON_PARENT_DIR}
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
|
|
Loading…
Reference in New Issue