intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-18 13:54:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: define release helper sources only once

Browse Source 
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2024-06-03 10:17:02 +00:00
committed by Compute-Runtime-Automation
parent eb3b0c5711
commit f3fa58de15
4 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -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=

20
shared/offline_compiler/source/CMakeLists.txt
View File

@@ -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

4
shared/source/release_helper/CMakeLists.txt
View File

@@ -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})

3
shared/test/common/libult/CMakeLists.txt
View File

@@ -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})