From d88b730daa2c139a82c48a2a58c3a12958cb6f15 Mon Sep 17 00:00:00 2001 From: Artur Harasimiuk Date: Thu, 30 Sep 2021 13:23:33 +0000 Subject: [PATCH] cmake: move compiler_interface to neo_shared Signed-off-by: Artur Harasimiuk --- opencl/source/compiler_interface/CMakeLists.txt | 5 +---- shared/source/CMakeLists.txt | 2 ++ shared/source/compiler_interface/CMakeLists.txt | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/opencl/source/compiler_interface/CMakeLists.txt b/opencl/source/compiler_interface/CMakeLists.txt index 781fc79c78..121d9003c7 100644 --- a/opencl/source/compiler_interface/CMakeLists.txt +++ b/opencl/source/compiler_interface/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2018-2020 Intel Corporation +# Copyright (C) 2018-2021 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -9,8 +9,5 @@ set(RUNTIME_SRCS_COMPILER_INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/default_cl_cache_config.cpp ) -get_property(NEO_COMPILER_INTERFACE GLOBAL PROPERTY NEO_COMPILER_INTERFACE) -list(APPEND RUNTIME_SRCS_COMPILER_INTERFACE ${NEO_COMPILER_INTERFACE}) - target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_COMPILER_INTERFACE}) set_property(GLOBAL PROPERTY RUNTIME_SRCS_COMPILER_INTERFACE ${RUNTIME_SRCS_COMPILER_INTERFACE}) diff --git a/shared/source/CMakeLists.txt b/shared/source/CMakeLists.txt index 858c3c38e2..206fb40a1a 100644 --- a/shared/source/CMakeLists.txt +++ b/shared/source/CMakeLists.txt @@ -39,6 +39,7 @@ function(generate_shared_lib LIB_NAME MOCKABLE) ${NEO__IGC_INCLUDE_DIR} ${KHRONOS_HEADERS_DIR} ${SOURCE_LEVEL_DEBUGGER_HEADERS_DIR} + ${VISA_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/os_interface/create_command_stream_receiver_${DRIVER_MODEL} ${CMAKE_CURRENT_SOURCE_DIR}/direct_submission/create_direct_submission_${DRIVER_MODEL} ) @@ -108,6 +109,7 @@ append_sources_from_properties(CORE_SOURCES NEO_CORE_COMMAND_CONTAINER NEO_CORE_COMMAND_ENCODERS NEO_CORE_COMMAND_STREAM + NEO_CORE_COMPILER_INTERFACE NEO_CORE_DEBUGGER NEO_CORE_DEBUG_SETTINGS NEO_CORE_DEVICE diff --git a/shared/source/compiler_interface/CMakeLists.txt b/shared/source/compiler_interface/CMakeLists.txt index 1245cd8cf9..4aa61a5683 100644 --- a/shared/source/compiler_interface/CMakeLists.txt +++ b/shared/source/compiler_interface/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT # -set(NEO_COMPILER_INTERFACE +set(NEO_CORE_COMPILER_INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/compiler_cache.h ${CMAKE_CURRENT_SOURCE_DIR}/compiler_cache.cpp @@ -23,4 +23,4 @@ set(NEO_COMPILER_INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/compiler_options${BRANCH_DIR_SUFFIX}compiler_options.h ) -set_property(GLOBAL PROPERTY NEO_COMPILER_INTERFACE ${NEO_COMPILER_INTERFACE}) +set_property(GLOBAL PROPERTY NEO_CORE_COMPILER_INTERFACE ${NEO_CORE_COMPILER_INTERFACE})