From 2f891d38e322104aafcd1efbcb3a79e5fa6ba5da Mon Sep 17 00:00:00 2001 From: Szymon Morek Date: Mon, 18 Oct 2021 15:07:39 +0000 Subject: [PATCH] Fix local mem helper enabling Signed-off-by: Szymon Morek --- shared/source/CMakeLists.txt | 3 +++ shared/source/enable_gens.cmake | 3 ++- shared/test/common/libult/CMakeLists.txt | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/shared/source/CMakeLists.txt b/shared/source/CMakeLists.txt index 874cca28bc..1d3d2ecf96 100644 --- a/shared/source/CMakeLists.txt +++ b/shared/source/CMakeLists.txt @@ -191,3 +191,6 @@ else() endif() set_property(GLOBAL PROPERTY NEO_CORE_SRCS_LINK ${CORE_SRCS_LINK}) +if(UNIX) + set_property(GLOBAL APPEND PROPERTY NEO_CORE_SRCS_LINK ${CORE_SRCS_LINK_LINUX}) +endif() diff --git a/shared/source/enable_gens.cmake b/shared/source/enable_gens.cmake index fb39274e3b..43df419b6d 100644 --- a/shared/source/enable_gens.cmake +++ b/shared/source/enable_gens.cmake @@ -70,7 +70,7 @@ macro(macro_for_each_platform) endif() set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}/os_interface/linux/local${BRANCH_DIR_SUFFIX}${PLATFORM_IT_LOWER}/enable_local_memory_helper_${PLATFORM_IT_LOWER}.cpp) if(EXISTS ${SRC_FILE}) - list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${SRC_FILE}) + list(APPEND ${GEN_TYPE}_SRC_LINK_LINUX ${SRC_FILE}) endif() set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}/ail${BRANCH_DIR}${GEN_TYPE_LOWER}${BRANCH}${PLATFORM_IT_LOWER}/ail_configuration_${PLATFORM_IT_LOWER}.cpp) @@ -167,6 +167,7 @@ macro(macro_for_each_gen) list(APPEND CORE_SRCS_GENX_ALL_LINUX ${CORE_SRCS_${GEN_TYPE}_CPP_LINUX}) list(APPEND CORE_SRCS_LINK ${${GEN_TYPE}_SRC_LINK_BASE}) + list(APPEND CORE_SRCS_LINK_LINUX ${${GEN_TYPE}_SRC_LINK_LINUX}) endmacro() apply_macro_for_each_gen("SUPPORTED") diff --git a/shared/test/common/libult/CMakeLists.txt b/shared/test/common/libult/CMakeLists.txt index bd3d79c6c5..30c1fbdd04 100644 --- a/shared/test/common/libult/CMakeLists.txt +++ b/shared/test/common/libult/CMakeLists.txt @@ -15,7 +15,7 @@ macro(macro_for_each_platform) endif() set(SRC_FILE ${NEO_SHARED_DIRECTORY}/os_interface/linux/local${BRANCH_DIR_SUFFIX}${PLATFORM_IT_LOWER}/enable_local_memory_helper_${PLATFORM_IT_LOWER}.cpp) if(EXISTS ${SRC_FILE}) - list(APPEND igdrcl_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) + list(APPEND igdrcl_libult_common_SRCS_ENABLE_TESTED_HW_LINUX ${SRC_FILE}) endif() set(SRC_FILE ${NEO_SHARED_DIRECTORY}/ail${BRANCH_DIR}${GEN_TYPE_LOWER}${BRANCH}${PLATFORM_IT_LOWER}/ail_configuration_${PLATFORM_IT_LOWER}.cpp) if(EXISTS ${SRC_FILE}) @@ -98,6 +98,10 @@ list(APPEND igdrcl_libult_common_SRCS_LIB_ULT ${NEO_SHARED_TESTS_CMD_PARSE} ) +if(UNIX) + list(APPEND igdrcl_libult_common_SRCS_ENABLE_TESTED_HW ${igdrcl_libult_common_SRCS_ENABLE_TESTED_HW_LINUX}) +endif() + add_library(igdrcl_libult_common OBJECT EXCLUDE_FROM_ALL ${igdrcl_libult_common_SRCS_LIB_ULT} ${igdrcl_libult_common_SRCS_ENABLE_TESTED_HW}