From 575d1bf381d5ad8e0937db0ea80770ab703012e6 Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Wed, 7 Mar 2018 19:49:20 +0100 Subject: [PATCH] Cmake refactor part 20 set global properties with runtime sources, libult sources and os interface tests Change-Id: I9a84edf2f021b4581a16c19c7dbb0b2f94c33f4d --- manifests/manifest.yml | 2 +- runtime/accelerators/CMakeLists.txt | 1 + runtime/api/CMakeLists.txt | 1 + runtime/aub_mem_dump/CMakeLists.txt | 1 + runtime/built_ins/CMakeLists.txt | 2 +- runtime/command_queue/CMakeLists.txt | 1 + runtime/command_stream/CMakeLists.txt | 2 +- runtime/compiler_interface/CMakeLists.txt | 1 + runtime/context/CMakeLists.txt | 1 + runtime/device/CMakeLists.txt | 2 +- runtime/device_queue/CMakeLists.txt | 2 +- runtime/enable_gens.cmake | 18 ++++++++++++------ runtime/event/CMakeLists.txt | 2 +- runtime/gmm_helper/CMakeLists.txt | 1 + runtime/gtpin/CMakeLists.txt | 1 + runtime/helpers/CMakeLists.txt | 1 + runtime/indirect_heap/CMakeLists.txt | 2 +- runtime/instrumentation/CMakeLists.txt | 2 +- runtime/kernel/CMakeLists.txt | 2 +- runtime/mem_obj/CMakeLists.txt | 1 + runtime/memory_manager/CMakeLists.txt | 1 + runtime/os_interface/CMakeLists.txt | 1 + runtime/os_interface/linux/CMakeLists.txt | 2 +- runtime/platform/CMakeLists.txt | 2 +- runtime/program/CMakeLists.txt | 2 +- runtime/sampler/CMakeLists.txt | 2 +- runtime/scheduler/CMakeLists.txt | 2 +- runtime/sharings/CMakeLists.txt | 3 ++- runtime/sku_info/CMakeLists.txt | 1 + runtime/tbx/CMakeLists.txt | 2 +- runtime/utilities/CMakeLists.txt | 2 ++ unit_tests/fixtures/CMakeLists.txt | 1 + unit_tests/libult/CMakeLists.txt | 7 +++++++ unit_tests/os_interface/CMakeLists.txt | 1 + unit_tests/os_interface/linux/CMakeLists.txt | 1 + .../linux/device_command_stream_fixture.h | 2 +- 36 files changed, 55 insertions(+), 23 deletions(-) diff --git a/manifests/manifest.yml b/manifests/manifest.yml index bd5df500f4..cc0e78336a 100644 --- a/manifests/manifest.yml +++ b/manifests/manifest.yml @@ -36,7 +36,7 @@ components: internal: branch: master dest_dir: internal - revision: 41c6cfb452569d1037b1449847230a7da788ad8d + revision: 1045f4b08e689ea893012f1c4d2883652c66c989 type: git khronos: branch: master diff --git a/runtime/accelerators/CMakeLists.txt b/runtime/accelerators/CMakeLists.txt index d4e38ed43f..94719e5519 100644 --- a/runtime/accelerators/CMakeLists.txt +++ b/runtime/accelerators/CMakeLists.txt @@ -27,3 +27,4 @@ set(RUNTIME_SRCS_ACCELERATORS ) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_ACCELERATORS}) +set_property(GLOBAL PROPERTY RUNTIME_SRCS_ACCELERATORS ${RUNTIME_SRCS_ACCELERATORS}) diff --git a/runtime/api/CMakeLists.txt b/runtime/api/CMakeLists.txt index 58f5ad74aa..fcc6c2b415 100644 --- a/runtime/api/CMakeLists.txt +++ b/runtime/api/CMakeLists.txt @@ -27,3 +27,4 @@ set(RUNTIME_SRCS_API ${CMAKE_CURRENT_SOURCE_DIR}/dispatch.h ) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_API}) +set_property(GLOBAL PROPERTY RUNTIME_SRCS_API ${RUNTIME_SRCS_API}) diff --git a/runtime/aub_mem_dump/CMakeLists.txt b/runtime/aub_mem_dump/CMakeLists.txt index 4e88c08e32..dbdda48740 100644 --- a/runtime/aub_mem_dump/CMakeLists.txt +++ b/runtime/aub_mem_dump/CMakeLists.txt @@ -27,3 +27,4 @@ set(RUNTIME_SRCS_AUB_MEM_DUMP ${CMAKE_CURRENT_SOURCE_DIR}/aub_services.h ) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_AUB_MEM_DUMP}) +set_property(GLOBAL PROPERTY RUNTIME_SRCS_AUB_MEM_DUMP ${RUNTIME_SRCS_AUB_MEM_DUMP}) diff --git a/runtime/built_ins/CMakeLists.txt b/runtime/built_ins/CMakeLists.txt index 8de679c700..66b04b77ac 100644 --- a/runtime/built_ins/CMakeLists.txt +++ b/runtime/built_ins/CMakeLists.txt @@ -27,8 +27,8 @@ set(RUNTIME_SRCS_BUILT_INS ${CMAKE_CURRENT_SOURCE_DIR}/sip.h ${CMAKE_CURRENT_SOURCE_DIR}/vme_dispatch_builder.h ) - target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_BUILT_INS}) +set_property(GLOBAL PROPERTY RUNTIME_SRCS_BUILT_INS ${RUNTIME_SRCS_BUILT_INS}) set(RUNTIME_SRCS_BUILT_IN_KERNELS ${CMAKE_CURRENT_SOURCE_DIR}/kernels/copy_buffer_rect.igdrcl_built_in diff --git a/runtime/command_queue/CMakeLists.txt b/runtime/command_queue/CMakeLists.txt index 1fae07b837..bd395ee888 100644 --- a/runtime/command_queue/CMakeLists.txt +++ b/runtime/command_queue/CMakeLists.txt @@ -57,3 +57,4 @@ set(RUNTIME_SRCS_COMMAND_QUEUE ${CMAKE_CURRENT_SOURCE_DIR}/local_work_size.cpp ) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_COMMAND_QUEUE}) +set_property(GLOBAL PROPERTY RUNTIME_SRCS_COMMAND_QUEUE ${RUNTIME_SRCS_COMMAND_QUEUE}) diff --git a/runtime/command_stream/CMakeLists.txt b/runtime/command_stream/CMakeLists.txt index 009b5fcf4d..9d7b88b849 100644 --- a/runtime/command_stream/CMakeLists.txt +++ b/runtime/command_stream/CMakeLists.txt @@ -48,5 +48,5 @@ set(RUNTIME_SRCS_COMMAND_STREAM ${CMAKE_CURRENT_SOURCE_DIR}/preemption.cpp ${CMAKE_CURRENT_SOURCE_DIR}/preemption.inl ) - target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_COMMAND_STREAM}) +set_property(GLOBAL PROPERTY RUNTIME_SRCS_COMMAND_STREAM ${RUNTIME_SRCS_COMMAND_STREAM}) diff --git a/runtime/compiler_interface/CMakeLists.txt b/runtime/compiler_interface/CMakeLists.txt index 9f4800abd1..b3270fdd8f 100644 --- a/runtime/compiler_interface/CMakeLists.txt +++ b/runtime/compiler_interface/CMakeLists.txt @@ -31,3 +31,4 @@ set(RUNTIME_SRCS_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/runtime/context/CMakeLists.txt b/runtime/context/CMakeLists.txt index 95b0af7725..22c093eb3e 100644 --- a/runtime/context/CMakeLists.txt +++ b/runtime/context/CMakeLists.txt @@ -28,3 +28,4 @@ set(RUNTIME_SRCS_CONTEXT ) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_CONTEXT}) +set_property(GLOBAL PROPERTY RUNTIME_SRCS_CONTEXT ${RUNTIME_SRCS_CONTEXT}) diff --git a/runtime/device/CMakeLists.txt b/runtime/device/CMakeLists.txt index 05a6dac645..adf380422b 100644 --- a/runtime/device/CMakeLists.txt +++ b/runtime/device/CMakeLists.txt @@ -29,5 +29,5 @@ set(RUNTIME_SRCS_DEVICE ${CMAKE_CURRENT_SOURCE_DIR}/device_vector.h ${CMAKE_CURRENT_SOURCE_DIR}/driver_info.h ) - target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_DEVICE}) +set_property(GLOBAL PROPERTY RUNTIME_SRCS_DEVICE ${RUNTIME_SRCS_DEVICE}) diff --git a/runtime/device_queue/CMakeLists.txt b/runtime/device_queue/CMakeLists.txt index abacee6fa9..dd003c9a24 100644 --- a/runtime/device_queue/CMakeLists.txt +++ b/runtime/device_queue/CMakeLists.txt @@ -26,5 +26,5 @@ set(RUNTIME_SRCS_DEVICE_QUEUE ${CMAKE_CURRENT_SOURCE_DIR}/device_queue_hw.inl ${CMAKE_CURRENT_SOURCE_DIR}/device_queue_hw_profiling.inl ) - target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_DEVICE_QUEUE}) +set_property(GLOBAL PROPERTY RUNTIME_SRCS_DEVICE_QUEUE ${RUNTIME_SRCS_DEVICE_QUEUE}) diff --git a/runtime/enable_gens.cmake b/runtime/enable_gens.cmake index b1bd2c4666..6e873f1c5b 100644 --- a/runtime/enable_gens.cmake +++ b/runtime/enable_gens.cmake @@ -96,15 +96,21 @@ foreach(GEN_TYPE ${ALL_GEN_TYPES}) list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${GENX_PREFIX}/gtpin_setup_${GEN_TYPE_LOWER}.cpp) endif(GTPIN_HEADERS_DIR) - list(APPEND RUNTIME_SRCS_GENX ${RUNTIME_SRCS_${GEN_TYPE}_BASE}) + list(APPEND RUNTIME_SRCS_GENX_ALL_BASE ${RUNTIME_SRCS_${GEN_TYPE}_BASE}) list(APPEND HW_SRC_LINK ${${GEN_TYPE}_SRC_LINK_BASE}) - if(WIN32) - list(APPEND RUNTIME_SRCS_GENX ${RUNTIME_SRCS_${GEN_TYPE}_WINDOWS}) - else() - list(APPEND RUNTIME_SRCS_GENX ${RUNTIME_SRCS_${GEN_TYPE}_LINUX}) + list(APPEND RUNTIME_SRCS_GENX_ALL_WINDOWS ${RUNTIME_SRCS_${GEN_TYPE}_WINDOWS}) + list(APPEND RUNTIME_SRCS_GENX_ALL_LINUX ${RUNTIME_SRCS_${GEN_TYPE}_LINUX}) + if(UNIX) list(APPEND HW_SRC_LINK ${${GEN_TYPE}_SRC_LINK_LINUX}) endif() endif() endforeach() -target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_GENX}) +target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_GENX_ALL_BASE}) +if(WIN32) + target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_GENX_ALL_WINDOWS}) +else() + target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_GENX_ALL_LINUX}) +endif() +set_property(GLOBAL PROPERTY RUNTIME_SRCS_GENX_ALL_BASE ${RUNTIME_SRCS_GENX_ALL_BASE}) +set_property(GLOBAL PROPERTY RUNTIME_SRCS_GENX_ALL_LINUX ${RUNTIME_SRCS_GENX_ALL_LINUX}) diff --git a/runtime/event/CMakeLists.txt b/runtime/event/CMakeLists.txt index f4a1595027..a5538ef1de 100644 --- a/runtime/event/CMakeLists.txt +++ b/runtime/event/CMakeLists.txt @@ -31,5 +31,5 @@ set(RUNTIME_SRCS_EVENT ${CMAKE_CURRENT_SOURCE_DIR}/hw_timestamps.h ${CMAKE_CURRENT_SOURCE_DIR}/perf_counter.h ) - target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_EVENT}) +set_property(GLOBAL PROPERTY RUNTIME_SRCS_EVENT ${RUNTIME_SRCS_EVENT}) diff --git a/runtime/gmm_helper/CMakeLists.txt b/runtime/gmm_helper/CMakeLists.txt index 45a8d04af1..6660c03f58 100644 --- a/runtime/gmm_helper/CMakeLists.txt +++ b/runtime/gmm_helper/CMakeLists.txt @@ -37,3 +37,4 @@ target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_GMM_HELPER_BASE}) if(WIN32) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_GMM_HELPER_WINDOWS}) endif() +set_property(GLOBAL PROPERTY RUNTIME_SRCS_GMM_HELPER_BASE ${RUNTIME_SRCS_GMM_HELPER_BASE}) diff --git a/runtime/gtpin/CMakeLists.txt b/runtime/gtpin/CMakeLists.txt index a37372327b..d53ba9b4ea 100644 --- a/runtime/gtpin/CMakeLists.txt +++ b/runtime/gtpin/CMakeLists.txt @@ -46,4 +46,5 @@ else() endif() target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_GTPIN}) +set_property(GLOBAL PROPERTY RUNTIME_SRCS_GTPIN ${RUNTIME_SRCS_GTPIN}) set(MSVC_DEF_ADDITIONAL_EXPORTS "${MSVC_DEF_ADDITIONAL_EXPORTS}" PARENT_SCOPE) diff --git a/runtime/helpers/CMakeLists.txt b/runtime/helpers/CMakeLists.txt index 8fa0a5d86d..853df5c0a1 100644 --- a/runtime/helpers/CMakeLists.txt +++ b/runtime/helpers/CMakeLists.txt @@ -94,3 +94,4 @@ target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_HELPERS_BASE}) if(WIN32) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_HELPERS_WINDOWS}) endif() +set_property(GLOBAL PROPERTY RUNTIME_SRCS_HELPERS_BASE ${RUNTIME_SRCS_HELPERS_BASE}) diff --git a/runtime/indirect_heap/CMakeLists.txt b/runtime/indirect_heap/CMakeLists.txt index 789dc7ff69..5b3678b20e 100644 --- a/runtime/indirect_heap/CMakeLists.txt +++ b/runtime/indirect_heap/CMakeLists.txt @@ -23,5 +23,5 @@ set(RUNTIME_SRCS_INDIRECT_HEAP ${CMAKE_CURRENT_SOURCE_DIR}/indirect_heap.cpp ${CMAKE_CURRENT_SOURCE_DIR}/indirect_heap.h ) - target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_INDIRECT_HEAP}) +set_property(GLOBAL PROPERTY RUNTIME_SRCS_INDIRECT_HEAP ${RUNTIME_SRCS_INDIRECT_HEAP}) diff --git a/runtime/instrumentation/CMakeLists.txt b/runtime/instrumentation/CMakeLists.txt index 43112a4714..33d3606812 100644 --- a/runtime/instrumentation/CMakeLists.txt +++ b/runtime/instrumentation/CMakeLists.txt @@ -23,5 +23,5 @@ set(RUNTIME_SRCS_INSTRUMENTATION ${CMAKE_CURRENT_SOURCE_DIR}/instrumentation.cpp ${CMAKE_CURRENT_SOURCE_DIR}/instrumentation.h ) - target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_INSTRUMENTATION}) +set_property(GLOBAL PROPERTY RUNTIME_SRCS_INSTRUMENTATION ${RUNTIME_SRCS_INSTRUMENTATION}) diff --git a/runtime/kernel/CMakeLists.txt b/runtime/kernel/CMakeLists.txt index 830e99e737..b3da184644 100644 --- a/runtime/kernel/CMakeLists.txt +++ b/runtime/kernel/CMakeLists.txt @@ -25,5 +25,5 @@ set(RUNTIME_SRCS_KERNEL ${CMAKE_CURRENT_SOURCE_DIR}/kernel.h ${CMAKE_CURRENT_SOURCE_DIR}/kernel.inl ) - target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_KERNEL}) +set_property(GLOBAL PROPERTY RUNTIME_SRCS_KERNEL ${RUNTIME_SRCS_KERNEL}) diff --git a/runtime/mem_obj/CMakeLists.txt b/runtime/mem_obj/CMakeLists.txt index e715adc1b3..cc8a1ef25e 100644 --- a/runtime/mem_obj/CMakeLists.txt +++ b/runtime/mem_obj/CMakeLists.txt @@ -37,3 +37,4 @@ set(RUNTIME_SRCS_MEM_OBJ ) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_MEM_OBJ}) +set_property(GLOBAL PROPERTY RUNTIME_SRCS_MEM_OBJ ${RUNTIME_SRCS_MEM_OBJ}) diff --git a/runtime/memory_manager/CMakeLists.txt b/runtime/memory_manager/CMakeLists.txt index 02628dbaa4..f8411f602c 100644 --- a/runtime/memory_manager/CMakeLists.txt +++ b/runtime/memory_manager/CMakeLists.txt @@ -43,3 +43,4 @@ set(RUNTIME_SRCS_MEMORY_MANAGER ) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_MEMORY_MANAGER}) +set_property(GLOBAL PROPERTY RUNTIME_SRCS_MEMORY_MANAGER ${RUNTIME_SRCS_MEMORY_MANAGER}) diff --git a/runtime/os_interface/CMakeLists.txt b/runtime/os_interface/CMakeLists.txt index 8d39a02f20..812db81163 100644 --- a/runtime/os_interface/CMakeLists.txt +++ b/runtime/os_interface/CMakeLists.txt @@ -37,4 +37,5 @@ set(RUNTIME_SRCS_OS_INTERFACE_BASE ) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_OS_INTERFACE_BASE}) +set_property(GLOBAL PROPERTY RUNTIME_SRCS_OS_INTERFACE_BASE ${RUNTIME_SRCS_OS_INTERFACE_BASE}) add_subdirectories() diff --git a/runtime/os_interface/linux/CMakeLists.txt b/runtime/os_interface/linux/CMakeLists.txt index 549553e18b..19b05e55f1 100644 --- a/runtime/os_interface/linux/CMakeLists.txt +++ b/runtime/os_interface/linux/CMakeLists.txt @@ -60,5 +60,5 @@ set(RUNTIME_SRCS_OS_INTERFACE_LINUX if(UNIX) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_OS_INTERFACE_LINUX}) endif() - +set_property(GLOBAL PROPERTY RUNTIME_SRCS_OS_INTERFACE_LINUX ${RUNTIME_SRCS_OS_INTERFACE_LINUX}) add_subdirectories() diff --git a/runtime/platform/CMakeLists.txt b/runtime/platform/CMakeLists.txt index e38933ea12..e63f9320d2 100644 --- a/runtime/platform/CMakeLists.txt +++ b/runtime/platform/CMakeLists.txt @@ -26,5 +26,5 @@ set(RUNTIME_SRCS_PLATFORM ${CMAKE_CURRENT_SOURCE_DIR}/platform.h ${CMAKE_CURRENT_SOURCE_DIR}/platform_info.h ) - target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_PLATFORM}) +set_property(GLOBAL PROPERTY RUNTIME_SRCS_PLATFORM ${RUNTIME_SRCS_PLATFORM}) diff --git a/runtime/program/CMakeLists.txt b/runtime/program/CMakeLists.txt index 4def4c20a6..012f30b3a5 100644 --- a/runtime/program/CMakeLists.txt +++ b/runtime/program/CMakeLists.txt @@ -43,5 +43,5 @@ set(RUNTIME_SRCS_PROGRAM ${CMAKE_CURRENT_SOURCE_DIR}/program.cpp ${CMAKE_CURRENT_SOURCE_DIR}/program.h ) - target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_PROGRAM}) +set_property(GLOBAL PROPERTY RUNTIME_SRCS_PROGRAM ${RUNTIME_SRCS_PROGRAM}) diff --git a/runtime/sampler/CMakeLists.txt b/runtime/sampler/CMakeLists.txt index 135ce0e660..aff347d5d2 100644 --- a/runtime/sampler/CMakeLists.txt +++ b/runtime/sampler/CMakeLists.txt @@ -25,5 +25,5 @@ set(RUNTIME_SRCS_SAMPLER ${CMAKE_CURRENT_SOURCE_DIR}/sampler.inl ${CMAKE_CURRENT_SOURCE_DIR}/sampler_factory_init.inl ) - target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_SAMPLER}) +set_property(GLOBAL PROPERTY RUNTIME_SRCS_SAMPLER ${RUNTIME_SRCS_SAMPLER}) diff --git a/runtime/scheduler/CMakeLists.txt b/runtime/scheduler/CMakeLists.txt index 4ee3242d2f..a947b2d13c 100644 --- a/runtime/scheduler/CMakeLists.txt +++ b/runtime/scheduler/CMakeLists.txt @@ -24,8 +24,8 @@ set(RUNTIME_SRCS_SCHEDULER ${CMAKE_CURRENT_SOURCE_DIR}/scheduler_kernel.cpp ${CMAKE_CURRENT_SOURCE_DIR}/scheduler_kernel.h ) - target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_SCHEDULER}) +set_property(GLOBAL PROPERTY RUNTIME_SRCS_SCHEDULER ${RUNTIME_SRCS_SCHEDULER}) if(NOT (TARGET ${SCHEDULER_BINARY_LIB_NAME})) include(scheduler_binary.cmake) diff --git a/runtime/sharings/CMakeLists.txt b/runtime/sharings/CMakeLists.txt index 7e7348e0ef..1bf0bf6e16 100644 --- a/runtime/sharings/CMakeLists.txt +++ b/runtime/sharings/CMakeLists.txt @@ -38,8 +38,9 @@ set(RUNTIME_SRCS_SHARINGS ${CMAKE_CURRENT_SOURCE_DIR}/sharing_factory.h ${CMAKE_CURRENT_SOURCE_DIR}/sharing_factory.inl ) - target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_SHARINGS}) +set_property(GLOBAL PROPERTY RUNTIME_SRCS_SHARINGS ${RUNTIME_SRCS_SHARINGS}) + if(WIN32) target_include_directories(${SHARINGS_ENABLE_LIB_NAME} PRIVATE ${IGDRCL_SOURCE_DIR}/runtime/os_interface/windows) diff --git a/runtime/sku_info/CMakeLists.txt b/runtime/sku_info/CMakeLists.txt index aaedc007aa..297d9831a2 100644 --- a/runtime/sku_info/CMakeLists.txt +++ b/runtime/sku_info/CMakeLists.txt @@ -32,6 +32,7 @@ set(RUNTIME_SRCS_SKU_INFO_WINDOWS ) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_SKU_INFO_BASE}) +set_property(GLOBAL PROPERTY RUNTIME_SRCS_SKU_INFO_BASE ${RUNTIME_SRCS_SKU_INFO_BASE}) if(WIN32) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_SKU_INFO_WINDOWS}) diff --git a/runtime/tbx/CMakeLists.txt b/runtime/tbx/CMakeLists.txt index 316bb91ca6..5fe443e68f 100644 --- a/runtime/tbx/CMakeLists.txt +++ b/runtime/tbx/CMakeLists.txt @@ -25,5 +25,5 @@ set(RUNTIME_SRCS_TBX ${CMAKE_CURRENT_SOURCE_DIR}/tbx_sockets_imp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tbx_sockets_imp.h ) - target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_TBX}) +set_property(GLOBAL PROPERTY RUNTIME_SRCS_TBX ${RUNTIME_SRCS_TBX}) diff --git a/runtime/utilities/CMakeLists.txt b/runtime/utilities/CMakeLists.txt index bcd29d4471..216030cb45 100644 --- a/runtime/utilities/CMakeLists.txt +++ b/runtime/utilities/CMakeLists.txt @@ -57,6 +57,8 @@ set(RUNTIME_SRCS_UTILITIES_LINUX ) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_UTILITIES_BASE}) +set_property(GLOBAL PROPERTY RUNTIME_SRCS_UTILITIES_BASE ${RUNTIME_SRCS_UTILITIES_BASE}) +set_property(GLOBAL PROPERTY RUNTIME_SRCS_UTILITIES_LINUX ${RUNTIME_SRCS_UTILITIES_LINUX}) if(WIN32) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_UTILITIES_WINDOWS}) else() diff --git a/unit_tests/fixtures/CMakeLists.txt b/unit_tests/fixtures/CMakeLists.txt index 9807bb9639..599226e122 100644 --- a/unit_tests/fixtures/CMakeLists.txt +++ b/unit_tests/fixtures/CMakeLists.txt @@ -48,3 +48,4 @@ set(IGDRCL_SRCS_tests_fixtures ${CMAKE_CURRENT_SOURCE_DIR}/two_walker_fixture.h ) target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_fixtures}) +set_property(GLOBAL PROPERTY IGDRCL_SRCS_tests_fixtures ${IGDRCL_SRCS_tests_fixtures}) \ No newline at end of file diff --git a/unit_tests/libult/CMakeLists.txt b/unit_tests/libult/CMakeLists.txt index dedcb09eb0..994e670880 100644 --- a/unit_tests/libult/CMakeLists.txt +++ b/unit_tests/libult/CMakeLists.txt @@ -125,6 +125,13 @@ target_include_directories(igdrcl_libult_env PRIVATE ${IGDRCL_SOURCE_DIR}/unit_tests/mocks${BRANCH_DIR_SUFFIX} ) +set_property(GLOBAL PROPERTY IGDRCL_SRCS_ENABLE_TESTED_HW ${IGDRCL_SRCS_ENABLE_TESTED_HW}) +set_property(GLOBAL PROPERTY IGDRCL_SRCS_ENABLE_TESTED_HW_LINUX ${IGDRCL_SRCS_ENABLE_TESTED_HW_LINUX}) +set_property(GLOBAL PROPERTY IGDRCL_SRCS_LIB_ULT ${IGDRCL_SRCS_LIB_ULT}) +set_property(GLOBAL PROPERTY IGDRCL_SRCS_LIB_ULT_CS ${IGDRCL_SRCS_LIB_ULT_CS}) +set_property(GLOBAL PROPERTY IGDRCL_SRCS_LIB_ULT_ENV ${IGDRCL_SRCS_LIB_ULT_ENV}) +set_property(GLOBAL PROPERTY IGDRCL_SRCS_LIB_ULT_ENV_LINUX ${IGDRCL_SRCS_LIB_ULT_ENV_LINUX}) + foreach(target_name igdrcl_libult igdrcl_libult_cs igdrcl_libult_env) set_target_properties(${target_name} PROPERTIES POSITION_INDEPENDENT_CODE ON) set_target_properties(${target_name} PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER}) diff --git a/unit_tests/os_interface/CMakeLists.txt b/unit_tests/os_interface/CMakeLists.txt index 210c4ba17d..57974d6947 100644 --- a/unit_tests/os_interface/CMakeLists.txt +++ b/unit_tests/os_interface/CMakeLists.txt @@ -33,4 +33,5 @@ set(IGDRCL_SRCS_tests_os_interface_base ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_tests.cpp ) target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_os_interface_base}) +set_property(GLOBAL PROPERTY IGDRCL_SRCS_tests_os_interface_base ${IGDRCL_SRCS_tests_os_interface_base}) add_subdirectories() diff --git a/unit_tests/os_interface/linux/CMakeLists.txt b/unit_tests/os_interface/linux/CMakeLists.txt index 2fb8834758..100b8d5a33 100644 --- a/unit_tests/os_interface/linux/CMakeLists.txt +++ b/unit_tests/os_interface/linux/CMakeLists.txt @@ -47,4 +47,5 @@ set(IGDRCL_SRCS_tests_os_interface_linux if(UNIX) target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_os_interface_linux}) endif() +set_property(GLOBAL PROPERTY IGDRCL_SRCS_tests_os_interface_linux ${IGDRCL_SRCS_tests_os_interface_linux}) add_subdirectories() diff --git a/unit_tests/os_interface/linux/device_command_stream_fixture.h b/unit_tests/os_interface/linux/device_command_stream_fixture.h index 133887b80e..c8b8daa0c6 100644 --- a/unit_tests/os_interface/linux/device_command_stream_fixture.h +++ b/unit_tests/os_interface/linux/device_command_stream_fixture.h @@ -21,7 +21,7 @@ */ #pragma once - +#include #include "drm/i915_drm.h" #include "gmock/gmock.h" #include "gtest/gtest.h"