From f3fa58de1502da5613beff470b9013f0e50e351b Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Mon, 3 Jun 2024 10:17:02 +0000 Subject: [PATCH] refactor: define release helper sources only once Signed-off-by: Mateusz Jablonski --- CMakeLists.txt | 1 + shared/offline_compiler/source/CMakeLists.txt | 20 ++++++------------- shared/source/release_helper/CMakeLists.txt | 4 +++- shared/test/common/libult/CMakeLists.txt | 3 ++- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 72b404e90c..12736314ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -917,6 +917,7 @@ if(MSVC) endif() endif() +add_subdirectory_unique(shared/source/release_helper) add_subdirectory_unique(${OCLOC_DIRECTORY} ${NEO_BUILD_DIR}/offline_compiler) target_compile_definitions(ocloc_lib PRIVATE MOCKABLE_VIRTUAL= diff --git a/shared/offline_compiler/source/CMakeLists.txt b/shared/offline_compiler/source/CMakeLists.txt index f88b4743ca..1fe0e19d01 100644 --- a/shared/offline_compiler/source/CMakeLists.txt +++ b/shared/offline_compiler/source/CMakeLists.txt @@ -9,7 +9,13 @@ project(${OCLOC_NAME}_lib) set(OCLOC_NAME "ocloc") set(OCLOC_FOLDER_NAME "offline_compiler") +append_sources_from_properties(RELEASE_HELPER_SOURCES + NEO_CORE_RELEASE_HELPER + NEO_CORE_ENABLE_RELEASE_HELPER +) + set(CLOC_LIB_SRCS_LIB + ${RELEASE_HELPER_SOURCES} ${NEO_SHARED_DIRECTORY}/ail/ail_configuration.h ${NEO_SHARED_DIRECTORY}/ail/ail_configuration.cpp ${NEO_SHARED_DIRECTORY}/ail${BRANCH_DIR_SUFFIX}ail_configuration_extra.cpp @@ -69,20 +75,6 @@ set(CLOC_LIB_SRCS_LIB ${NEO_SHARED_DIRECTORY}/helpers/product_config_helper.cpp ${NEO_SHARED_DIRECTORY}/helpers/product_config_helper.h ${NEO_SHARED_DIRECTORY}/os_interface/os_library.h - ${NEO_SHARED_DIRECTORY}/release_helper/release_helper.h - ${NEO_SHARED_DIRECTORY}/release_helper/release_helper.cpp - ${NEO_SHARED_DIRECTORY}/release_helper/release_helper_base.inl - ${NEO_SHARED_DIRECTORY}/release_helper/release_helper_1255.cpp - ${NEO_SHARED_DIRECTORY}/release_helper/release_helper_1256.cpp - ${NEO_SHARED_DIRECTORY}/release_helper/release_helper_1257.cpp - ${NEO_SHARED_DIRECTORY}/release_helper/release_helper_1260.cpp - ${NEO_SHARED_DIRECTORY}/release_helper/release_helper_1261.cpp - ${NEO_SHARED_DIRECTORY}/release_helper/release_helper_1270.cpp - ${NEO_SHARED_DIRECTORY}/release_helper/release_helper_1271.cpp - ${NEO_SHARED_DIRECTORY}/release_helper/release_helper_1274.cpp - ${NEO_SHARED_DIRECTORY}/release_helper/enable_release_helper_xe.cpp - ${NEO_SHARED_DIRECTORY}/release_helper/release_helper_common_xe_lpg.inl - ${NEO_SHARED_DIRECTORY}/release_helper/definitions${BRANCH_DIR_SUFFIX}release_definitions.h ${NEO_SHARED_DIRECTORY}/sku_info/definitions${BRANCH_DIR_SUFFIX}sku_info.cpp ${NEO_SHARED_DIRECTORY}/utilities/directory.h ${NEO_SHARED_DIRECTORY}/utilities/io_functions.cpp diff --git a/shared/source/release_helper/CMakeLists.txt b/shared/source/release_helper/CMakeLists.txt index 555ae5a3da..5e60d09602 100644 --- a/shared/source/release_helper/CMakeLists.txt +++ b/shared/source/release_helper/CMakeLists.txt @@ -26,9 +26,11 @@ if(SUPPORT_XE_HPG_CORE OR SUPPORT_XE_HPC_CORE) ${CMAKE_CURRENT_SOURCE_DIR}/release_helper_1271.cpp ${CMAKE_CURRENT_SOURCE_DIR}/release_helper_1274.cpp ) - set_property(GLOBAL APPEND PROPERTY NEO_CORE_SRCS_LINK ${CMAKE_CURRENT_SOURCE_DIR}/enable_release_helper_xe.cpp) + set_property(GLOBAL APPEND PROPERTY NEO_CORE_ENABLE_RELEASE_HELPER ${CMAKE_CURRENT_SOURCE_DIR}/enable_release_helper_xe.cpp) endif() set_property(GLOBAL APPEND PROPERTY NEO_CORE_RELEASE_HELPER ${NEO_CORE_RELEASE_HELPER}) add_subdirectories() +get_property(NEO_CORE_ENABLE_RELEASE_HELPER GLOBAL PROPERTY NEO_CORE_ENABLE_RELEASE_HELPER) +set_property(GLOBAL APPEND PROPERTY NEO_CORE_SRCS_LINK ${NEO_CORE_ENABLE_RELEASE_HELPER}) diff --git a/shared/test/common/libult/CMakeLists.txt b/shared/test/common/libult/CMakeLists.txt index 0853ec0bdb..b29b14d88d 100644 --- a/shared/test/common/libult/CMakeLists.txt +++ b/shared/test/common/libult/CMakeLists.txt @@ -140,7 +140,6 @@ endif() if(TESTS_XE_HPG_CORE OR TESTS_XE_HPC_CORE) list(APPEND neo_libult_common_SRCS_LIB_ULT ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/unit_test_helper_xe_hpg_and_xe_hpc.inl - ${NEO_SHARED_DIRECTORY}/release_helper/enable_release_helper_xe.cpp ) endif() @@ -150,6 +149,8 @@ if(TESTS_PVC_AND_LATER) ) endif() +append_sources_from_properties(neo_libult_common_SRCS_LIB_ULT NEO_CORE_ENABLE_RELEASE_HELPER) + set_property(GLOBAL PROPERTY neo_libult_common_SRCS_LIB_ULT ${neo_libult_common_SRCS_LIB_ULT}) set_property(GLOBAL PROPERTY neo_libult_common_SRCS_ENABLE_TESTED_HW ${neo_libult_common_SRCS_ENABLE_TESTED_HW})