From cb7437b6b77338f41f49ed78f565f382b8e81003 Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Thu, 16 Mar 2023 12:46:44 +0000 Subject: [PATCH] refactor l0 tools: cleanup cmake files append sources in current directory Related-To: NEO-7507 Signed-off-by: Mateusz Jablonski --- level_zero/tools/source/CMakeLists.txt | 11 +-- .../tools/source/metrics/CMakeLists.txt | 46 +++++-------- .../tools/source/metrics/linux/CMakeLists.txt | 17 ++--- .../source/metrics/windows/CMakeLists.txt | 17 ++--- level_zero/tools/source/pin/CMakeLists.txt | 13 +--- .../tools/source/pin/linux/CMakeLists.txt | 10 +-- .../tools/source/pin/windows/CMakeLists.txt | 12 +--- level_zero/tools/source/sysman/CMakeLists.txt | 16 ++--- .../source/sysman/diagnostics/CMakeLists.txt | 19 ++---- .../sysman/diagnostics/linux/CMakeLists.txt | 15 ++--- .../sysman/diagnostics/windows/CMakeLists.txt | 13 +--- .../tools/source/sysman/ecc/CMakeLists.txt | 20 ++---- .../source/sysman/ecc/linux/CMakeLists.txt | 13 +--- .../source/sysman/ecc/windows/CMakeLists.txt | 13 +--- .../tools/source/sysman/engine/CMakeLists.txt | 19 ++---- .../source/sysman/engine/linux/CMakeLists.txt | 35 +++++----- .../sysman/engine/windows/CMakeLists.txt | 15 ++--- .../tools/source/sysman/events/CMakeLists.txt | 22 ++---- .../source/sysman/events/linux/CMakeLists.txt | 13 +--- .../sysman/events/windows/CMakeLists.txt | 15 ++--- .../source/sysman/fabric_port/CMakeLists.txt | 19 ++---- .../sysman/fabric_port/linux/CMakeLists.txt | 67 +++++++++---------- .../sysman/fabric_port/windows/CMakeLists.txt | 15 ++--- .../tools/source/sysman/fan/CMakeLists.txt | 19 ++---- .../source/sysman/fan/linux/CMakeLists.txt | 12 +--- .../source/sysman/fan/windows/CMakeLists.txt | 15 ++--- .../source/sysman/firmware/CMakeLists.txt | 20 ++---- .../sysman/firmware/linux/CMakeLists.txt | 37 +++++----- .../sysman/firmware/windows/CMakeLists.txt | 15 ++--- .../sysman/firmware_util/CMakeLists.txt | 31 ++++----- .../sysman/firmware_util/linux/CMakeLists.txt | 13 +--- .../firmware_util/windows/CMakeLists.txt | 13 +--- .../source/sysman/frequency/CMakeLists.txt | 25 ++----- .../sysman/frequency/linux/CMakeLists.txt | 37 +++++----- .../sysman/frequency/windows/CMakeLists.txt | 13 +--- .../sysman/global_operations/CMakeLists.txt | 28 ++------ .../global_operations/linux/CMakeLists.txt | 38 +++++------ .../global_operations/windows/CMakeLists.txt | 15 ++--- .../tools/source/sysman/linux/CMakeLists.txt | 23 +++---- .../source/sysman/linux/nl_api/CMakeLists.txt | 27 +++----- .../source/sysman/linux/pmt/CMakeLists.txt | 13 ++-- .../source/sysman/linux/pmu/CMakeLists.txt | 13 ++-- .../source/sysman/linux/udev/CMakeLists.txt | 29 +++----- .../tools/source/sysman/memory/CMakeLists.txt | 19 ++---- .../source/sysman/memory/linux/CMakeLists.txt | 49 +++++++------- .../sysman/memory/windows/CMakeLists.txt | 13 +--- .../tools/source/sysman/pci/CMakeLists.txt | 23 ++----- .../source/sysman/pci/linux/CMakeLists.txt | 15 ++--- .../source/sysman/pci/windows/CMakeLists.txt | 15 ++--- .../source/sysman/performance/CMakeLists.txt | 25 ++----- .../sysman/performance/linux/CMakeLists.txt | 37 +++++----- .../sysman/performance/windows/CMakeLists.txt | 13 +--- .../tools/source/sysman/power/CMakeLists.txt | 19 ++---- .../source/sysman/power/linux/CMakeLists.txt | 39 +++++------ .../sysman/power/windows/CMakeLists.txt | 15 ++--- .../tools/source/sysman/ras/CMakeLists.txt | 19 ++---- .../source/sysman/ras/linux/CMakeLists.txt | 40 +++++------ .../source/sysman/ras/windows/CMakeLists.txt | 11 +-- .../source/sysman/scheduler/CMakeLists.txt | 19 ++---- .../sysman/scheduler/linux/CMakeLists.txt | 35 +++++----- .../sysman/scheduler/windows/CMakeLists.txt | 15 ++--- .../source/sysman/standby/CMakeLists.txt | 25 ++----- .../sysman/standby/linux/CMakeLists.txt | 15 ++--- .../sysman/standby/windows/CMakeLists.txt | 13 +--- .../source/sysman/temperature/CMakeLists.txt | 19 ++---- .../sysman/temperature/linux/CMakeLists.txt | 15 ++--- .../sysman/temperature/windows/CMakeLists.txt | 15 ++--- .../source/sysman/windows/CMakeLists.txt | 23 +++---- .../sysman/firmware_util/CMakeLists.txt | 14 ++-- 69 files changed, 481 insertions(+), 970 deletions(-) diff --git a/level_zero/tools/source/CMakeLists.txt b/level_zero/tools/source/CMakeLists.txt index 6139f8ec81..5d4b23c657 100644 --- a/level_zero/tools/source/CMakeLists.txt +++ b/level_zero/tools/source/CMakeLists.txt @@ -1,19 +1,12 @@ # -# Copyright (C) 2020-2022 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -add_subdirectory(debug) -add_subdirectory(metrics) -add_subdirectory(sysman) -add_subdirectory(pin) +add_subdirectories() target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_TOOLS_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ) - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_TOOLS_SOURCES ${L0_TOOLS_SOURCES}) diff --git a/level_zero/tools/source/metrics/CMakeLists.txt b/level_zero/tools/source/metrics/CMakeLists.txt index 6acf1f521f..a384404b8b 100644 --- a/level_zero/tools/source/metrics/CMakeLists.txt +++ b/level_zero/tools/source/metrics/CMakeLists.txt @@ -1,40 +1,26 @@ # -# Copyright (C) 2020-2022 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_METRICS -) - -list(APPEND L0_SRCS_TOOLS_METRICS - ${CMAKE_CURRENT_SOURCE_DIR}/metric.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/metric_oa_enumeration_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/metric_oa_enumeration_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/metric_oa_streamer_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/metric_oa_streamer_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/metric_oa_query_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/metric_oa_query_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/metric_oa_source.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/metric_oa_source.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_ip_sampling.h - ${CMAKE_CURRENT_SOURCE_DIR}/metric_ip_sampling_source.h - ${CMAKE_CURRENT_SOURCE_DIR}/metric_ip_sampling_source.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/metric_ip_sampling_streamer.h - ${CMAKE_CURRENT_SOURCE_DIR}/metric_ip_sampling_streamer.cpp -) - -if(UNIX) - add_subdirectory(linux) -else() - add_subdirectory(windows) -endif() - target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_METRICS} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/metric.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/metric_oa_enumeration_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/metric_oa_enumeration_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/metric_oa_streamer_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/metric_oa_streamer_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/metric_oa_query_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/metric_oa_query_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/metric_oa_source.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/metric_oa_source.h + ${CMAKE_CURRENT_SOURCE_DIR}/metric_ip_sampling_source.h + ${CMAKE_CURRENT_SOURCE_DIR}/metric_ip_sampling_source.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/metric_ip_sampling_streamer.h + ${CMAKE_CURRENT_SOURCE_DIR}/metric_ip_sampling_streamer.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_ip_sampling.h ) -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_METRICS ${L0_SRCS_TOOLS_METRICS}) +add_subdirectories() diff --git a/level_zero/tools/source/metrics/linux/CMakeLists.txt b/level_zero/tools/source/metrics/linux/CMakeLists.txt index 852a1e6cc1..6d97c36e90 100644 --- a/level_zero/tools/source/metrics/linux/CMakeLists.txt +++ b/level_zero/tools/source/metrics/linux/CMakeLists.txt @@ -4,20 +4,13 @@ # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_oa_query_imp_linux.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_oa_enumeration_imp_linux.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_oa_streamer_imp_linux.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_ip_sampling_imp_linux.cpp -) - if(UNIX) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_LINUX} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_oa_query_imp_linux.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_oa_enumeration_imp_linux.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_oa_streamer_imp_linux.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_ip_sampling_imp_linux.cpp ) - - # Make our source files visible to parent - set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_LINUX ${L0_SRCS_TOOLS_LINUX}) endif() diff --git a/level_zero/tools/source/metrics/windows/CMakeLists.txt b/level_zero/tools/source/metrics/windows/CMakeLists.txt index d5aa381d4a..844a9e95ff 100644 --- a/level_zero/tools/source/metrics/windows/CMakeLists.txt +++ b/level_zero/tools/source/metrics/windows/CMakeLists.txt @@ -4,20 +4,13 @@ # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_WINDOWS - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_oa_streamer_imp_windows.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_oa_query_imp_windows.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_oa_enumeration_imp_windows.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_ip_sampling_imp_windows.cpp -) - if(WIN32) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_WINDOWS} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_oa_streamer_imp_windows.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_oa_query_imp_windows.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_oa_enumeration_imp_windows.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_ip_sampling_imp_windows.cpp ) - - # Make our source files visible to parent - set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_WINDOWS ${L0_SRCS_TOOLS_WINDOWS}) endif() diff --git a/level_zero/tools/source/pin/CMakeLists.txt b/level_zero/tools/source/pin/CMakeLists.txt index 40d45df458..5b66de486c 100644 --- a/level_zero/tools/source/pin/CMakeLists.txt +++ b/level_zero/tools/source/pin/CMakeLists.txt @@ -1,21 +1,14 @@ # -# Copyright (C) 2020-2021 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_PIN - ${CMAKE_CURRENT_SOURCE_DIR}/pin.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pin.h -) - target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_PIN} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/pin.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/pin.h ) add_subdirectories() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_PIN ${L0_SRCS_TOOLS_PIN}) diff --git a/level_zero/tools/source/pin/linux/CMakeLists.txt b/level_zero/tools/source/pin/linux/CMakeLists.txt index 4da6e56f2a..53182bb5c4 100644 --- a/level_zero/tools/source/pin/linux/CMakeLists.txt +++ b/level_zero/tools/source/pin/linux/CMakeLists.txt @@ -1,18 +1,14 @@ # -# Copyright (C) 2020 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/os_pin.h -) - if(UNIX) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_LINUX} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_pin.h ) target_include_directories(${L0_STATIC_LIB_NAME} PRIVATE @@ -20,5 +16,3 @@ if(UNIX) ) endif() -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_LINUX ${L0_SRCS_TOOLS_LINUX}) diff --git a/level_zero/tools/source/pin/windows/CMakeLists.txt b/level_zero/tools/source/pin/windows/CMakeLists.txt index fd0143e600..432016da30 100644 --- a/level_zero/tools/source/pin/windows/CMakeLists.txt +++ b/level_zero/tools/source/pin/windows/CMakeLists.txt @@ -1,25 +1,17 @@ # -# Copyright (C) 2020 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_WINDOWS - ${CMAKE_CURRENT_SOURCE_DIR}/os_pin.h -) - if(WIN32) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_WINDOWS} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_pin.h ) target_include_directories(${L0_STATIC_LIB_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ) endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_WINDOWS ${L0_SRCS_TOOLS_WINDOWS}) - diff --git a/level_zero/tools/source/sysman/CMakeLists.txt b/level_zero/tools/source/sysman/CMakeLists.txt index e9f0e7c914..b6a005ee20 100644 --- a/level_zero/tools/source/sysman/CMakeLists.txt +++ b/level_zero/tools/source/sysman/CMakeLists.txt @@ -1,23 +1,17 @@ # -# Copyright (C) 2020-2021 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN - ${CMAKE_CURRENT_SOURCE_DIR}/sysman.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/sysman.h - ${CMAKE_CURRENT_SOURCE_DIR}/sysman_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/sysman_imp.h -) - target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/sysman.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/sysman.h + ${CMAKE_CURRENT_SOURCE_DIR}/sysman_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/sysman_imp.h ) add_subdirectories() -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN ${L0_SRCS_TOOLS_SYSMAN}) diff --git a/level_zero/tools/source/sysman/diagnostics/CMakeLists.txt b/level_zero/tools/source/sysman/diagnostics/CMakeLists.txt index bd617fef62..7de7a4f61d 100644 --- a/level_zero/tools/source/sysman/diagnostics/CMakeLists.txt +++ b/level_zero/tools/source/sysman/diagnostics/CMakeLists.txt @@ -1,25 +1,18 @@ # -# Copyright (C) 2021 Intel Corporation +# Copyright (C) 2021-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_DIAGNOSTICS - ${CMAKE_CURRENT_SOURCE_DIR}/diagnostics.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/diagnostics.h - ${CMAKE_CURRENT_SOURCE_DIR}/diagnostics_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/diagnostics_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_diagnostics.h -) - target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_DIAGNOSTICS} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/diagnostics.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/diagnostics.h + ${CMAKE_CURRENT_SOURCE_DIR}/diagnostics_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/diagnostics_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_diagnostics.h ) add_subdirectories() -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_DIAGNOSTICS ${L0_SRCS_TOOLS_SYSMAN_DIAGNOSTICS}) - diff --git a/level_zero/tools/source/sysman/diagnostics/linux/CMakeLists.txt b/level_zero/tools/source/sysman/diagnostics/linux/CMakeLists.txt index ba230628e9..a863b2c755 100644 --- a/level_zero/tools/source/sysman/diagnostics/linux/CMakeLists.txt +++ b/level_zero/tools/source/sysman/diagnostics/linux/CMakeLists.txt @@ -1,21 +1,14 @@ # -# Copyright (C) 2021-2022 Intel Corporation +# Copyright (C) 2021-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_DIAGNOSTICS_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_diagnostics_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_diagnostics_imp.h -) - if(UNIX) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_DIAGNOSTICS_LINUX} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_diagnostics_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_diagnostics_imp.h ) endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_DIAGNOSTICS_LINUX ${L0_SRCS_TOOLS_SYSMAN_DIAGNOSTICS_LINUX}) diff --git a/level_zero/tools/source/sysman/diagnostics/windows/CMakeLists.txt b/level_zero/tools/source/sysman/diagnostics/windows/CMakeLists.txt index 5b74cb4088..73cbaff201 100644 --- a/level_zero/tools/source/sysman/diagnostics/windows/CMakeLists.txt +++ b/level_zero/tools/source/sysman/diagnostics/windows/CMakeLists.txt @@ -1,20 +1,13 @@ # -# Copyright (C) 2021 Intel Corporation +# Copyright (C) 2021-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_DIAGNOSTICS_WINDOWS - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_diagnostics_imp.cpp -) - if(WIN32) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_DIAGNOSTICS_WINDOWS} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_diagnostics_imp.cpp ) endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_DIAGNOSTICS_WINDOWS ${L0_SRCS_TOOLS_SYSMAN_DIAGNOSTICS_WINDOWS}) diff --git a/level_zero/tools/source/sysman/ecc/CMakeLists.txt b/level_zero/tools/source/sysman/ecc/CMakeLists.txt index 1ef6da25b1..1838098613 100644 --- a/level_zero/tools/source/sysman/ecc/CMakeLists.txt +++ b/level_zero/tools/source/sysman/ecc/CMakeLists.txt @@ -1,27 +1,15 @@ # -# Copyright (C) 2022 Intel Corporation +# Copyright (C) 2022-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_ECC - ${CMAKE_CURRENT_SOURCE_DIR}/ecc.h - ${CMAKE_CURRENT_SOURCE_DIR}/ecc_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/ecc_imp.h -) - -target_include_directories(${L0_STATIC_LIB_NAME} - PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}/ -) - target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_ECC} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/ecc.h + ${CMAKE_CURRENT_SOURCE_DIR}/ecc_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ecc_imp.h ) add_subdirectories() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_ECC ${L0_SRCS_TOOLS_ECC}) diff --git a/level_zero/tools/source/sysman/ecc/linux/CMakeLists.txt b/level_zero/tools/source/sysman/ecc/linux/CMakeLists.txt index 448b93a047..6d9b55727f 100644 --- a/level_zero/tools/source/sysman/ecc/linux/CMakeLists.txt +++ b/level_zero/tools/source/sysman/ecc/linux/CMakeLists.txt @@ -1,20 +1,13 @@ # -# Copyright (C) 2022 Intel Corporation +# Copyright (C) 2022-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_ECC_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_ecc.cpp -) - if(UNIX) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_ECC_LINUX} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_ecc.cpp ) endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_ECC_LINUX ${L0_SRCS_TOOLS_SYSMAN_ECC_LINUX}) diff --git a/level_zero/tools/source/sysman/ecc/windows/CMakeLists.txt b/level_zero/tools/source/sysman/ecc/windows/CMakeLists.txt index ca82bcf3ce..74a4b87f9e 100755 --- a/level_zero/tools/source/sysman/ecc/windows/CMakeLists.txt +++ b/level_zero/tools/source/sysman/ecc/windows/CMakeLists.txt @@ -1,20 +1,13 @@ # -# Copyright (C) 2022 Intel Corporation +# Copyright (C) 2022-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_ECC_WINDOWS - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_ecc.cpp -) - if(WIN32) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_ECC_WINDOWS} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_ecc.cpp ) endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_ECC_WINDOWS ${L0_SRCS_TOOLS_SYSMAN_ECC_WINDOWS}) diff --git a/level_zero/tools/source/sysman/engine/CMakeLists.txt b/level_zero/tools/source/sysman/engine/CMakeLists.txt index cbd3187d44..9419e814e5 100755 --- a/level_zero/tools/source/sysman/engine/CMakeLists.txt +++ b/level_zero/tools/source/sysman/engine/CMakeLists.txt @@ -1,24 +1,17 @@ # -# Copyright (C) 2020 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_ENGINE - ${CMAKE_CURRENT_SOURCE_DIR}/engine.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/engine.h - ${CMAKE_CURRENT_SOURCE_DIR}/engine_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/engine_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_engine.h -) - target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_ENGINE} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/engine.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/engine.h + ${CMAKE_CURRENT_SOURCE_DIR}/engine_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/engine_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_engine.h ) add_subdirectories() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_ENGINE ${L0_SRCS_TOOLS_SYSMAN_ENGINE}) diff --git a/level_zero/tools/source/sysman/engine/linux/CMakeLists.txt b/level_zero/tools/source/sysman/engine/linux/CMakeLists.txt index 1e98f620a6..ea706d5674 100755 --- a/level_zero/tools/source/sysman/engine/linux/CMakeLists.txt +++ b/level_zero/tools/source/sysman/engine/linux/CMakeLists.txt @@ -1,30 +1,27 @@ # -# Copyright (C) 2020-2022 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_ENGINE_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_engine_imp.h -) - -if(NEO_ENABLE_i915_PRELIM_DETECTION) - list(APPEND L0_SRCS_TOOLS_SYSMAN_ENGINE_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/os_engine_imp_prelim.cpp - ) -else() - list(APPEND L0_SRCS_TOOLS_SYSMAN_ENGINE_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/os_engine_imp.cpp - ) -endif() - if(UNIX) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_ENGINE_LINUX} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_engine_imp.h ) + + if(NEO_ENABLE_i915_PRELIM_DETECTION) + target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/os_engine_imp_prelim.cpp + ) + else() + target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/os_engine_imp.cpp + ) + endif() + endif() -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_ENGINE_LINUX ${L0_SRCS_TOOLS_SYSMAN_ENGINE_LINUX}) diff --git a/level_zero/tools/source/sysman/engine/windows/CMakeLists.txt b/level_zero/tools/source/sysman/engine/windows/CMakeLists.txt index 1fd3f4c1bd..acd98f8483 100755 --- a/level_zero/tools/source/sysman/engine/windows/CMakeLists.txt +++ b/level_zero/tools/source/sysman/engine/windows/CMakeLists.txt @@ -1,21 +1,14 @@ # -# Copyright (C) 2020 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_ENGINE_WINDOWS - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_engine_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_engine_imp.cpp -) - if(WIN32) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_ENGINE_WINDOWS} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_engine_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_engine_imp.cpp ) endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_ENGINE_WINDOWS ${L0_SRCS_TOOLS_SYSMAN_ENGINE_WINDOWS}) diff --git a/level_zero/tools/source/sysman/events/CMakeLists.txt b/level_zero/tools/source/sysman/events/CMakeLists.txt index d0511d890b..1ec36bd612 100644 --- a/level_zero/tools/source/sysman/events/CMakeLists.txt +++ b/level_zero/tools/source/sysman/events/CMakeLists.txt @@ -1,27 +1,17 @@ # -# Copyright (C) 2020 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_EVENTS - ${CMAKE_CURRENT_SOURCE_DIR}/events.h - ${CMAKE_CURRENT_SOURCE_DIR}/events_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/events_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_events.h -) - target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_EVENTS} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/events.h + ${CMAKE_CURRENT_SOURCE_DIR}/events_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/events_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_events.h ) -if(UNIX) - add_subdirectory(linux) -else() - add_subdirectory(windows) -endif() +add_subdirectories() -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_EVENTS ${L0_SRCS_TOOLS_SYSMAN_EVENTS}) diff --git a/level_zero/tools/source/sysman/events/linux/CMakeLists.txt b/level_zero/tools/source/sysman/events/linux/CMakeLists.txt index bec629f6dd..b2311d7341 100644 --- a/level_zero/tools/source/sysman/events/linux/CMakeLists.txt +++ b/level_zero/tools/source/sysman/events/linux/CMakeLists.txt @@ -4,18 +4,11 @@ # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_EVENTS_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_events_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_events_imp.h -) - if(UNIX) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_EVENTS_LINUX} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_events_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_events_imp.h ) endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_EVENTS_LINUX ${L0_SRCS_TOOLS_SYSMAN_EVENTS_LINUX}) diff --git a/level_zero/tools/source/sysman/events/windows/CMakeLists.txt b/level_zero/tools/source/sysman/events/windows/CMakeLists.txt index 0ecc506990..08ff44c9ce 100644 --- a/level_zero/tools/source/sysman/events/windows/CMakeLists.txt +++ b/level_zero/tools/source/sysman/events/windows/CMakeLists.txt @@ -1,21 +1,14 @@ # -# Copyright (C) 2020 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_EVENTS_WINDOWS - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_events_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_events_imp.cpp -) - if(WIN32) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_EVENTS_WINDOWS} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_events_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_events_imp.cpp ) endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_EVENTS_WINDOWS ${L0_SRCS_TOOLS_SYSMAN_EVENTS_WINDOWS}) diff --git a/level_zero/tools/source/sysman/fabric_port/CMakeLists.txt b/level_zero/tools/source/sysman/fabric_port/CMakeLists.txt index 6e53db009c..fabdda7679 100644 --- a/level_zero/tools/source/sysman/fabric_port/CMakeLists.txt +++ b/level_zero/tools/source/sysman/fabric_port/CMakeLists.txt @@ -1,24 +1,17 @@ # -# Copyright (C) 2020 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_FABRICPORT - ${CMAKE_CURRENT_SOURCE_DIR}/fabric_port.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/fabric_port.h - ${CMAKE_CURRENT_SOURCE_DIR}/fabric_port_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/fabric_port_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_fabric_port.h -) - target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_FABRICPORT} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/fabric_port.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/fabric_port.h + ${CMAKE_CURRENT_SOURCE_DIR}/fabric_port_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/fabric_port_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_fabric_port.h ) add_subdirectories() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_FABRICPORT ${L0_SRCS_TOOLS_SYSMAN_FABRICPORT}) diff --git a/level_zero/tools/source/sysman/fabric_port/linux/CMakeLists.txt b/level_zero/tools/source/sysman/fabric_port/linux/CMakeLists.txt index 0a1a3b821a..c73944ad98 100644 --- a/level_zero/tools/source/sysman/fabric_port/linux/CMakeLists.txt +++ b/level_zero/tools/source/sysman/fabric_port/linux/CMakeLists.txt @@ -1,45 +1,42 @@ # -# Copyright (C) 2020-2022 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_FABRICPORT_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt -) - -if(NEO_ENABLE_i915_PRELIM_DETECTION) - list(APPEND L0_SRCS_TOOLS_SYSMAN_FABRICPORT_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/os_fabric_port_imp_prelim.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_fabric_port_imp_prelim.h - ) - - if(LIBGENL_FOUND) - set(L0_SRCS_TOOLS_SYSMAN_FABRICPORT_LINUX_ACCESS - ${CMAKE_CURRENT_SOURCE_DIR}/fabric_device_access.h - ${CMAKE_CURRENT_SOURCE_DIR}/fabric_device_access_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/fabric_device_access_imp.h - ) - else() - set(L0_SRCS_TOOLS_SYSMAN_FABRICPORT_LINUX_ACCESS - ${CMAKE_CURRENT_SOURCE_DIR}/fabric_device_access_stub.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/fabric_device_access_stub.h - ) - endif() -else() - list(APPEND L0_SRCS_TOOLS_SYSMAN_FABRICPORT_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/os_fabric_port_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_fabric_port_imp.h - ) -endif() - if(UNIX) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_FABRICPORT_LINUX} - ${L0_SRCS_TOOLS_SYSMAN_FABRICPORT_LINUX_ACCESS} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ) -endif() -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_FABRICPORT_LINUX ${L0_SRCS_TOOLS_SYSMAN_FABRICPORT_LINUX}) + if(NEO_ENABLE_i915_PRELIM_DETECTION) + target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/os_fabric_port_imp_prelim.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_fabric_port_imp_prelim.h + ) + + if(LIBGENL_FOUND) + target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/fabric_device_access.h + ${CMAKE_CURRENT_SOURCE_DIR}/fabric_device_access_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/fabric_device_access_imp.h + ) + else() + target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/fabric_device_access_stub.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/fabric_device_access_stub.h + ) + endif() + else() + target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/os_fabric_port_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_fabric_port_imp.h + ) + endif() + +endif() diff --git a/level_zero/tools/source/sysman/fabric_port/windows/CMakeLists.txt b/level_zero/tools/source/sysman/fabric_port/windows/CMakeLists.txt index 9786ff761c..d4989479f3 100644 --- a/level_zero/tools/source/sysman/fabric_port/windows/CMakeLists.txt +++ b/level_zero/tools/source/sysman/fabric_port/windows/CMakeLists.txt @@ -1,21 +1,14 @@ # -# Copyright (C) 2020 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_FABRICPORT_WINDOWS - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_fabric_port_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_fabric_port_imp.h -) - if(WIN32) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_FABRICPORT_WINDOWS} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_fabric_port_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_fabric_port_imp.h ) endif() - -## Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_FABRICPORT_WINDOWS ${L0_SRCS_TOOLS_SYSMAN_FABRICPORT_WINDOWS}) diff --git a/level_zero/tools/source/sysman/fan/CMakeLists.txt b/level_zero/tools/source/sysman/fan/CMakeLists.txt index 1d6d8a0a2b..e3a6922ca9 100644 --- a/level_zero/tools/source/sysman/fan/CMakeLists.txt +++ b/level_zero/tools/source/sysman/fan/CMakeLists.txt @@ -1,24 +1,17 @@ # -# Copyright (C) 2020 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_FAN - ${CMAKE_CURRENT_SOURCE_DIR}/fan.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/fan.h - ${CMAKE_CURRENT_SOURCE_DIR}/fan_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/fan_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_fan.h -) - target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_FAN} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/fan.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/fan.h + ${CMAKE_CURRENT_SOURCE_DIR}/fan_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/fan_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_fan.h ) add_subdirectories() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_FAN ${L0_SRCS_TOOLS_SYSMAN_FAN}) diff --git a/level_zero/tools/source/sysman/fan/linux/CMakeLists.txt b/level_zero/tools/source/sysman/fan/linux/CMakeLists.txt index d5488c1691..3d3fe9c9e2 100644 --- a/level_zero/tools/source/sysman/fan/linux/CMakeLists.txt +++ b/level_zero/tools/source/sysman/fan/linux/CMakeLists.txt @@ -1,20 +1,14 @@ # -# Copyright (C) 2020 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_FAN_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/os_fan_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_fan_imp.h -) - if(UNIX) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_FAN_LINUX} + ${CMAKE_CURRENT_SOURCE_DIR}/os_fan_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_fan_imp.h ) endif() -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_FAN_LINUX ${L0_SRCS_TOOLS_SYSMAN_FAN_LINUX}) diff --git a/level_zero/tools/source/sysman/fan/windows/CMakeLists.txt b/level_zero/tools/source/sysman/fan/windows/CMakeLists.txt index f9c491dc82..47b047e0b3 100644 --- a/level_zero/tools/source/sysman/fan/windows/CMakeLists.txt +++ b/level_zero/tools/source/sysman/fan/windows/CMakeLists.txt @@ -1,21 +1,14 @@ # -# Copyright (C) 2020 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_FAN_WINDOWS - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_fan_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_fan_imp.cpp -) - if(WIN32) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_FAN_WINDOWS} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_fan_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_fan_imp.cpp ) endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_FAN_WINDOWS ${L0_SRCS_TOOLS_SYSMAN_FAN_WINDOWS}) diff --git a/level_zero/tools/source/sysman/firmware/CMakeLists.txt b/level_zero/tools/source/sysman/firmware/CMakeLists.txt index 020738067d..1b1487d92d 100644 --- a/level_zero/tools/source/sysman/firmware/CMakeLists.txt +++ b/level_zero/tools/source/sysman/firmware/CMakeLists.txt @@ -1,25 +1,17 @@ # -# Copyright (C) 2020 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_FIRMWARE - ${CMAKE_CURRENT_SOURCE_DIR}/firmware.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/firmware.h - ${CMAKE_CURRENT_SOURCE_DIR}/firmware_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/firmware_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware.h -) - target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_FIRMWARE} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/firmware.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/firmware.h + ${CMAKE_CURRENT_SOURCE_DIR}/firmware_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/firmware_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware.h ) add_subdirectories() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_FIRMWARE ${L0_SRCS_TOOLS_SYSMAN_FIRMWARE}) - diff --git a/level_zero/tools/source/sysman/firmware/linux/CMakeLists.txt b/level_zero/tools/source/sysman/firmware/linux/CMakeLists.txt index 30b1a65536..eca5c7bd62 100644 --- a/level_zero/tools/source/sysman/firmware/linux/CMakeLists.txt +++ b/level_zero/tools/source/sysman/firmware/linux/CMakeLists.txt @@ -1,31 +1,26 @@ # -# Copyright (C) 2020-2022 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_FIRMWARE_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware_imp.h -) - -if(NEO_ENABLE_i915_PRELIM_DETECTION) - list(APPEND L0_SRCS_TOOLS_SYSMAN_FIRMWARE_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware_imp_helper_prelim.cpp - ) -else() - list(APPEND L0_SRCS_TOOLS_SYSMAN_FIRMWARE_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware_imp_helper.cpp - ) -endif() - if(UNIX) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_FIRMWARE_LINUX} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware_imp.h ) -endif() -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_FIRMWARE_LINUX ${L0_SRCS_TOOLS_SYSMAN_FIRMWARE_LINUX}) + if(NEO_ENABLE_i915_PRELIM_DETECTION) + target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware_imp_helper_prelim.cpp + ) + else() + target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware_imp_helper.cpp + ) + endif() +endif() diff --git a/level_zero/tools/source/sysman/firmware/windows/CMakeLists.txt b/level_zero/tools/source/sysman/firmware/windows/CMakeLists.txt index 7fde7cf431..3f522bdf49 100644 --- a/level_zero/tools/source/sysman/firmware/windows/CMakeLists.txt +++ b/level_zero/tools/source/sysman/firmware/windows/CMakeLists.txt @@ -1,21 +1,14 @@ # -# Copyright (C) 2020-2022 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_FIRMWARE_WINDOWS - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware_imp.h -) - if(WIN32) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_FIRMWARE_WINDOWS} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware_imp.h ) endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_FIRMWARE_WINDOWS ${L0_SRCS_TOOLS_SYSMAN_FIRMWARE_WINDOWS}) diff --git a/level_zero/tools/source/sysman/firmware_util/CMakeLists.txt b/level_zero/tools/source/sysman/firmware_util/CMakeLists.txt index 52ea514d30..ff7d76c5a2 100644 --- a/level_zero/tools/source/sysman/firmware_util/CMakeLists.txt +++ b/level_zero/tools/source/sysman/firmware_util/CMakeLists.txt @@ -1,30 +1,25 @@ # -# Copyright (C) 2022 Intel Corporation +# Copyright (C) 2022-2023 Intel Corporation # # SPDX-License-Identifier: MIT # if(igsc_FOUND) - set(L0_SRCS_TOOLS_SYSMAN_FIRMWARE_UTIL - ${CMAKE_CURRENT_SOURCE_DIR}/firmware_util_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/firmware_util_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/firmware_util.h - ${CMAKE_CURRENT_SOURCE_DIR}/igsc_wrapper.h - ${CMAKE_CURRENT_SOURCE_DIR}/firmware_util_imp_helper.cpp + target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/firmware_util_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/firmware_util_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/firmware_util.h + ${CMAKE_CURRENT_SOURCE_DIR}/igsc_wrapper.h + ${CMAKE_CURRENT_SOURCE_DIR}/firmware_util_imp_helper.cpp ) add_subdirectories() else() - set(L0_SRCS_TOOLS_SYSMAN_FIRMWARE_UTIL - ${CMAKE_CURRENT_SOURCE_DIR}/firmware_util_imp_stub.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/firmware_util.h - ${CMAKE_CURRENT_SOURCE_DIR}/igsc_wrapper.h + target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/firmware_util_imp_stub.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/firmware_util.h + ${CMAKE_CURRENT_SOURCE_DIR}/igsc_wrapper.h ) endif() -target_sources(${L0_STATIC_LIB_NAME} - PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_FIRMWARE_UTIL} -) - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_FIRMWARE_UTILITY ${L0_SRCS_TOOLS_SYSMAN_FIRMWARE_UTILITY}) diff --git a/level_zero/tools/source/sysman/firmware_util/linux/CMakeLists.txt b/level_zero/tools/source/sysman/firmware_util/linux/CMakeLists.txt index 52b3aeab8b..4bc66fe3b8 100644 --- a/level_zero/tools/source/sysman/firmware_util/linux/CMakeLists.txt +++ b/level_zero/tools/source/sysman/firmware_util/linux/CMakeLists.txt @@ -1,20 +1,13 @@ # -# Copyright (C) 2022 Intel Corporation +# Copyright (C) 2022-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_FIRMWARE_UTIL_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware_util_enumeration.cpp -) - if(UNIX) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_FIRMWARE_UTIL_LINUX} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware_util_enumeration.cpp ) endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_FIRMWARE_UTIL_LINUX ${L0_SRCS_TOOLS_SYSMAN_FIRMWARE_UTIL_LINUX}) \ No newline at end of file diff --git a/level_zero/tools/source/sysman/firmware_util/windows/CMakeLists.txt b/level_zero/tools/source/sysman/firmware_util/windows/CMakeLists.txt index 13c5f599fe..57d7234e47 100644 --- a/level_zero/tools/source/sysman/firmware_util/windows/CMakeLists.txt +++ b/level_zero/tools/source/sysman/firmware_util/windows/CMakeLists.txt @@ -1,20 +1,13 @@ # -# Copyright (C) 2022 Intel Corporation +# Copyright (C) 2022-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_FIRMWARE_UTIL_WINDOWS - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware_util_enumeration.cpp -) - if(WIN32) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_FIRMWARE_UTIL_WINDOWS} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware_util_enumeration.cpp ) endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_FIRMWARE_UTIL_WINDOWS ${L0_SRCS_TOOLS_SYSMAN_FIRMWARE_UTIL_WINDOWS}) \ No newline at end of file diff --git a/level_zero/tools/source/sysman/frequency/CMakeLists.txt b/level_zero/tools/source/sysman/frequency/CMakeLists.txt index ba210310a3..b32a0ab33f 100644 --- a/level_zero/tools/source/sysman/frequency/CMakeLists.txt +++ b/level_zero/tools/source/sysman/frequency/CMakeLists.txt @@ -1,28 +1,17 @@ # -# Copyright (C) 2020-2021 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_FREQUENCY - ${CMAKE_CURRENT_SOURCE_DIR}/frequency.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/frequency.h - ${CMAKE_CURRENT_SOURCE_DIR}/frequency_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/frequency_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_frequency.h -) - target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_FREQUENCY} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/frequency.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/frequency.h + ${CMAKE_CURRENT_SOURCE_DIR}/frequency_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/frequency_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_frequency.h ) -if(UNIX) - add_subdirectory(linux) -else() - add_subdirectory(windows) -endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_FREQUENCY ${L0_SRCS_TOOLS_SYSMAN_FREQUENCY}) +add_subdirectories() diff --git a/level_zero/tools/source/sysman/frequency/linux/CMakeLists.txt b/level_zero/tools/source/sysman/frequency/linux/CMakeLists.txt index ac2cda0b04..ca3b3f61f2 100644 --- a/level_zero/tools/source/sysman/frequency/linux/CMakeLists.txt +++ b/level_zero/tools/source/sysman/frequency/linux/CMakeLists.txt @@ -1,31 +1,26 @@ # -# Copyright (C) 2020-2022 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_FREQUENCY_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt -) - -if(NEO_ENABLE_i915_PRELIM_DETECTION) - list(APPEND L0_SRCS_TOOLS_SYSMAN_FREQUENCY_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/os_frequency_imp_prelim.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_frequency_imp_prelim.h - ) -else() - list(APPEND L0_SRCS_TOOLS_SYSMAN_FREQUENCY_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/os_frequency_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_frequency_imp.h - ) -endif() - if(UNIX) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_FREQUENCY_LINUX} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ) -endif() -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_FREQUENCY_LINUX ${L0_SRCS_TOOLS_SYSMAN_FREQUENCY_LINUX}) + if(NEO_ENABLE_i915_PRELIM_DETECTION) + target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/os_frequency_imp_prelim.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_frequency_imp_prelim.h + ) + else() + target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/os_frequency_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_frequency_imp.h + ) + endif() +endif() diff --git a/level_zero/tools/source/sysman/frequency/windows/CMakeLists.txt b/level_zero/tools/source/sysman/frequency/windows/CMakeLists.txt index d41a36c8b3..f1f352d6fd 100644 --- a/level_zero/tools/source/sysman/frequency/windows/CMakeLists.txt +++ b/level_zero/tools/source/sysman/frequency/windows/CMakeLists.txt @@ -1,20 +1,13 @@ # -# Copyright (C) 2020 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_FREQUENCY_WINDOWS - ${CMAKE_CURRENT_SOURCE_DIR}/os_frequency_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_frequency_imp.cpp -) - if(WIN32) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_FREQUENCY_WINDOWS} + ${CMAKE_CURRENT_SOURCE_DIR}/os_frequency_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_frequency_imp.cpp ) endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_FREQUENCY_WINDOWS ${L0_SRCS_TOOLS_SYSMAN_FREQUENCY_WINDOWS}) diff --git a/level_zero/tools/source/sysman/global_operations/CMakeLists.txt b/level_zero/tools/source/sysman/global_operations/CMakeLists.txt index 78c45605ca..abb60695ae 100644 --- a/level_zero/tools/source/sysman/global_operations/CMakeLists.txt +++ b/level_zero/tools/source/sysman/global_operations/CMakeLists.txt @@ -1,32 +1,16 @@ # -# Copyright (C) 2020 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_GLOBAL_OPERATIONS - ${CMAKE_CURRENT_SOURCE_DIR}/global_operations.h - ${CMAKE_CURRENT_SOURCE_DIR}/global_operations_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/global_operations_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_global_operations.h -) - -target_include_directories(${L0_STATIC_LIB_NAME} - PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}/ -) - target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_GLOBAL_OPERATIONS} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/global_operations.h + ${CMAKE_CURRENT_SOURCE_DIR}/global_operations_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/global_operations_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_global_operations.h ) -if(UNIX) - add_subdirectory(linux) -else() - add_subdirectory(windows) -endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_GLOBAL_OPERATIONS ${L0_SRCS_TOOLS_GLOBAL_OPERATIONS}) +add_subdirectories() diff --git a/level_zero/tools/source/sysman/global_operations/linux/CMakeLists.txt b/level_zero/tools/source/sysman/global_operations/linux/CMakeLists.txt index b179f23ac4..8772872d20 100644 --- a/level_zero/tools/source/sysman/global_operations/linux/CMakeLists.txt +++ b/level_zero/tools/source/sysman/global_operations/linux/CMakeLists.txt @@ -1,31 +1,27 @@ # -# Copyright (C) 2020-2022 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_GLOBAL_OPERATIONS_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_global_operations_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_global_operations_imp.h -) - -if(NEO_ENABLE_i915_PRELIM_DETECTION) - list(APPEND L0_SRCS_TOOLS_GLOBAL_OPERATIONS_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/os_global_operations_helper_prelim.cpp - ) -else() - list(APPEND L0_SRCS_TOOLS_GLOBAL_OPERATIONS_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/os_global_operations_helper.cpp - ) -endif() - if(UNIX) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_GLOBAL_OPERATIONS_LINUX} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_global_operations_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_global_operations_imp.h ) -endif() -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_GLOBAL_OPERATIONS_LINUX ${L0_SRCS_TOOLS_GLOBAL_OPERATIONS_LINUX}) + if(NEO_ENABLE_i915_PRELIM_DETECTION) + target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/os_global_operations_helper_prelim.cpp + ) + else() + target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/os_global_operations_helper.cpp + ) + endif() + +endif() diff --git a/level_zero/tools/source/sysman/global_operations/windows/CMakeLists.txt b/level_zero/tools/source/sysman/global_operations/windows/CMakeLists.txt index 92f99b863d..bfd319c2f8 100644 --- a/level_zero/tools/source/sysman/global_operations/windows/CMakeLists.txt +++ b/level_zero/tools/source/sysman/global_operations/windows/CMakeLists.txt @@ -1,22 +1,15 @@ # -# Copyright (C) 2020-2021 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_GLOBAL_OPERATIONS_WINDOWS - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_global_operations_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_global_operations_imp.cpp -) - if(WIN32) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_GLOBAL_OPERATIONS_WINDOWS} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_global_operations_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_global_operations_imp.cpp ) endif() -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_GLOBAL_OPERATIONS_WINDOWS ${L0_SRCS_TOOLS_GLOBAL_OPERATIONS_WINDOWS}) - diff --git a/level_zero/tools/source/sysman/linux/CMakeLists.txt b/level_zero/tools/source/sysman/linux/CMakeLists.txt index b93d6f3dc7..467f5e8585 100644 --- a/level_zero/tools/source/sysman/linux/CMakeLists.txt +++ b/level_zero/tools/source/sysman/linux/CMakeLists.txt @@ -4,23 +4,16 @@ # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_driver_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_driver_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/fs_access.cpp -) - if(UNIX) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_LINUX} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/fs_access.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_driver_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_driver_imp.cpp ) + + add_subdirectories() endif() - -add_subdirectories() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_LINUX ${L0_SRCS_TOOLS_SYSMAN_LINUX}) diff --git a/level_zero/tools/source/sysman/linux/nl_api/CMakeLists.txt b/level_zero/tools/source/sysman/linux/nl_api/CMakeLists.txt index 5933b17b9c..f992bba075 100644 --- a/level_zero/tools/source/sysman/linux/nl_api/CMakeLists.txt +++ b/level_zero/tools/source/sysman/linux/nl_api/CMakeLists.txt @@ -1,24 +1,17 @@ # -# Copyright (C) 2020-2022 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -if(LIBGENL_FOUND) - set(L0_SRCS_TOOLS_SYSMAN_LINUX_NL_API - ${CMAKE_CURRENT_SOURCE_DIR}/nl_api.h - ${CMAKE_CURRENT_SOURCE_DIR}/nl_api.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/iaf_nl_api.h - ${CMAKE_CURRENT_SOURCE_DIR}/iaf_nl_api.cpp - ) -endif() - if(UNIX) - target_sources(${L0_STATIC_LIB_NAME} - PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_LINUX_NL_API} - ) + if(LIBGENL_FOUND) + target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/nl_api.h + ${CMAKE_CURRENT_SOURCE_DIR}/nl_api.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/iaf_nl_api.h + ${CMAKE_CURRENT_SOURCE_DIR}/iaf_nl_api.cpp + ) + endif() endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_LINUX_NL_API ${L0_SRCS_TOOLS_SYSMAN_LINUX_NL_API}) diff --git a/level_zero/tools/source/sysman/linux/pmt/CMakeLists.txt b/level_zero/tools/source/sysman/linux/pmt/CMakeLists.txt index ecd336aa6c..c77e1cd715 100644 --- a/level_zero/tools/source/sysman/linux/pmt/CMakeLists.txt +++ b/level_zero/tools/source/sysman/linux/pmt/CMakeLists.txt @@ -1,19 +1,14 @@ # -# Copyright (C) 2021-2022 Intel Corporation +# Copyright (C) 2021-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_LINUX_PMT - ${CMAKE_CURRENT_SOURCE_DIR}/pmt_helper.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pmt.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pmt.h -) if(UNIX) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_LINUX_PMT} + ${CMAKE_CURRENT_SOURCE_DIR}/pmt_helper.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/pmt.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/pmt.h ) endif() -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_PMT_LINUX ${L0_SRCS_TOOLS_SYSMAN_PMT_LINUX}) diff --git a/level_zero/tools/source/sysman/linux/pmu/CMakeLists.txt b/level_zero/tools/source/sysman/linux/pmu/CMakeLists.txt index 6c893b214f..964b9bfc8d 100644 --- a/level_zero/tools/source/sysman/linux/pmu/CMakeLists.txt +++ b/level_zero/tools/source/sysman/linux/pmu/CMakeLists.txt @@ -1,19 +1,14 @@ # -# Copyright (C) 2020 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_LINUX_PMU - ${CMAKE_CURRENT_SOURCE_DIR}/pmu_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pmu_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/pmu.h -) if(UNIX) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_LINUX_PMU} + ${CMAKE_CURRENT_SOURCE_DIR}/pmu_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/pmu_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/pmu.h ) endif() -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_PMU_LINUX ${L0_SRCS_TOOLS_SYSMAN_PMU_LINUX}) diff --git a/level_zero/tools/source/sysman/linux/udev/CMakeLists.txt b/level_zero/tools/source/sysman/linux/udev/CMakeLists.txt index 164e737430..d3c9996967 100644 --- a/level_zero/tools/source/sysman/linux/udev/CMakeLists.txt +++ b/level_zero/tools/source/sysman/linux/udev/CMakeLists.txt @@ -1,29 +1,20 @@ # -# Copyright (C) 2022 Intel Corporation +# Copyright (C) 2022-2023 Intel Corporation # # SPDX-License-Identifier: MIT # if(LIBUDEV_FOUND) - set(L0_SRCS_TOOLS_SYSMAN_LINUX_UDEV_LIB - ${CMAKE_CURRENT_SOURCE_DIR}/udev_lib_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/udev_lib_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/udev_lib.h - ) - add_subdirectories() -else() - set(L0_SRCS_TOOLS_SYSMAN_LINUX_UDEV_LIB - ${CMAKE_CURRENT_SOURCE_DIR}/udev_lib_imp_stub.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/udev_lib.h - ) -endif() - -if(UNIX) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_LINUX_UDEV_LIB} + ${CMAKE_CURRENT_SOURCE_DIR}/udev_lib_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/udev_lib_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/udev_lib.h + ) +else() + target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/udev_lib_imp_stub.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/udev_lib.h ) endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_LINUX_UDEV_LIB ${L0_SRCS_TOOLS_SYSMAN_LINUX_UDEV_LIB}) diff --git a/level_zero/tools/source/sysman/memory/CMakeLists.txt b/level_zero/tools/source/sysman/memory/CMakeLists.txt index 517a58389e..5f47c27604 100755 --- a/level_zero/tools/source/sysman/memory/CMakeLists.txt +++ b/level_zero/tools/source/sysman/memory/CMakeLists.txt @@ -1,24 +1,17 @@ # -# Copyright (C) 2020 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_MEMORY - ${CMAKE_CURRENT_SOURCE_DIR}/memory.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/memory.h - ${CMAKE_CURRENT_SOURCE_DIR}/memory_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/memory_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_memory.h -) - target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_MEMORY} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/memory.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/memory.h + ${CMAKE_CURRENT_SOURCE_DIR}/memory_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/memory_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_memory.h ) add_subdirectories() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_MEMORY ${L0_SRCS_TOOLS_SYSMAN_MEMORY}) diff --git a/level_zero/tools/source/sysman/memory/linux/CMakeLists.txt b/level_zero/tools/source/sysman/memory/linux/CMakeLists.txt index ad181e89fb..6fe6ce9721 100755 --- a/level_zero/tools/source/sysman/memory/linux/CMakeLists.txt +++ b/level_zero/tools/source/sysman/memory/linux/CMakeLists.txt @@ -1,36 +1,33 @@ # -# Copyright (C) 2020-2022 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_MEMORY_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt -) - -if(NEO_ENABLE_i915_PRELIM_DETECTION) - list(APPEND L0_SRCS_TOOLS_SYSMAN_MEMORY_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp_prelim.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp_prelim.h - ) -elseif(SUPPORT_DG1 AND "${BRANCH_TYPE}" STREQUAL "") - list(APPEND L0_SRCS_TOOLS_SYSMAN_MEMORY_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp_dg1.cpp - ) -else() - list(APPEND L0_SRCS_TOOLS_SYSMAN_MEMORY_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp.cpp - ) -endif() - if(UNIX) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_MEMORY_LINUX} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ) -endif() -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_MEMORY_LINUX ${L0_SRCS_TOOLS_SYSMAN_MEMORY_LINUX}) + if(NEO_ENABLE_i915_PRELIM_DETECTION) + target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp_prelim.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp_prelim.h + ) + elseif(SUPPORT_DG1 AND "${BRANCH_TYPE}" STREQUAL "") + target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp_dg1.cpp + ) + else() + target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp.cpp + ) + endif() + +endif() diff --git a/level_zero/tools/source/sysman/memory/windows/CMakeLists.txt b/level_zero/tools/source/sysman/memory/windows/CMakeLists.txt index 17652f5240..c888a539c3 100755 --- a/level_zero/tools/source/sysman/memory/windows/CMakeLists.txt +++ b/level_zero/tools/source/sysman/memory/windows/CMakeLists.txt @@ -1,20 +1,13 @@ # -# Copyright (C) 2020 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_MEMORY_WINDOWS - ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp.cpp -) - if(WIN32) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_MEMORY_WINDOWS} + ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp.cpp ) endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_MEMORY_WINDOWS ${L0_SRCS_TOOLS_SYSMAN_MEMORY_WINDOWS}) diff --git a/level_zero/tools/source/sysman/pci/CMakeLists.txt b/level_zero/tools/source/sysman/pci/CMakeLists.txt index 90dcb1bc2f..dcbb845fbd 100644 --- a/level_zero/tools/source/sysman/pci/CMakeLists.txt +++ b/level_zero/tools/source/sysman/pci/CMakeLists.txt @@ -1,27 +1,16 @@ # -# Copyright (C) 2020-2021 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_PCI - ${CMAKE_CURRENT_SOURCE_DIR}/pci.h - ${CMAKE_CURRENT_SOURCE_DIR}/pci_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pci_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_pci.h -) - target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_PCI} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/pci.h + ${CMAKE_CURRENT_SOURCE_DIR}/pci_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/pci_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_pci.h ) -if(UNIX) - add_subdirectory(linux) -else() - add_subdirectory(windows) -endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_PCI ${L0_SRCS_TOOLS_SYSMAN_PCI}) +add_subdirectories() diff --git a/level_zero/tools/source/sysman/pci/linux/CMakeLists.txt b/level_zero/tools/source/sysman/pci/linux/CMakeLists.txt index 8d4e0094bb..b46a705f2b 100644 --- a/level_zero/tools/source/sysman/pci/linux/CMakeLists.txt +++ b/level_zero/tools/source/sysman/pci/linux/CMakeLists.txt @@ -1,21 +1,14 @@ # -# Copyright (C) 2020-2021 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_PCI_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_pci_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_pci_imp.h -) - if(UNIX) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_PCI_LINUX} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_pci_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_pci_imp.h ) endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_PCI_LINUX ${L0_SRCS_TOOLS_SYSMAN_PCI_LINUX}) diff --git a/level_zero/tools/source/sysman/pci/windows/CMakeLists.txt b/level_zero/tools/source/sysman/pci/windows/CMakeLists.txt index b18d60222a..edeae7b5b4 100644 --- a/level_zero/tools/source/sysman/pci/windows/CMakeLists.txt +++ b/level_zero/tools/source/sysman/pci/windows/CMakeLists.txt @@ -1,21 +1,14 @@ # -# Copyright (C) 2020-2021 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_PCI_WINDOWS - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_pci_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_pci_imp.h -) - if(WIN32) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_PCI_WINDOWS} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_pci_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_pci_imp.h ) endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_PCI_WINDOWS ${L0_SRCS_TOOLS_SYSMAN_PCI_WINDOWS}) diff --git a/level_zero/tools/source/sysman/performance/CMakeLists.txt b/level_zero/tools/source/sysman/performance/CMakeLists.txt index a223c22680..c41c60c3de 100644 --- a/level_zero/tools/source/sysman/performance/CMakeLists.txt +++ b/level_zero/tools/source/sysman/performance/CMakeLists.txt @@ -1,28 +1,17 @@ # -# Copyright (C) 2021 Intel Corporation +# Copyright (C) 2021-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_PERFORMANCE - ${CMAKE_CURRENT_SOURCE_DIR}/performance.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/performance.h - ${CMAKE_CURRENT_SOURCE_DIR}/performance_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/performance_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_performance.h -) - target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_PERFORMANCE} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/performance.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/performance.h + ${CMAKE_CURRENT_SOURCE_DIR}/performance_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/performance_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_performance.h ) -if(UNIX) - add_subdirectory(linux) -else() - add_subdirectory(windows) -endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_PERFORMANCE ${L0_SRCS_TOOLS_SYSMAN_PERFORMANCE}) +add_subdirectories() diff --git a/level_zero/tools/source/sysman/performance/linux/CMakeLists.txt b/level_zero/tools/source/sysman/performance/linux/CMakeLists.txt index a0440feea9..65e1fc3f79 100644 --- a/level_zero/tools/source/sysman/performance/linux/CMakeLists.txt +++ b/level_zero/tools/source/sysman/performance/linux/CMakeLists.txt @@ -1,31 +1,26 @@ # -# Copyright (C) 2021-2022 Intel Corporation +# Copyright (C) 2021-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_PERFORMANCE_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt -) - -if(NEO_ENABLE_i915_PRELIM_DETECTION) - list(APPEND L0_SRCS_TOOLS_SYSMAN_PERFORMANCE_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/os_performance_imp_prelim.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_performance_imp_prelim.h - ) -else() - list(APPEND L0_SRCS_TOOLS_SYSMAN_PERFORMANCE_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/os_performance_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_performance_imp.h - ) -endif() - if(UNIX) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_PERFORMANCE_LINUX} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ) -endif() -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_PERFORMANCE_LINUX ${L0_SRCS_TOOLS_SYSMAN_PERFORMANCE_LINUX}) + if(NEO_ENABLE_i915_PRELIM_DETECTION) + target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/os_performance_imp_prelim.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_performance_imp_prelim.h + ) + else() + target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/os_performance_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_performance_imp.h + ) + endif() +endif() diff --git a/level_zero/tools/source/sysman/performance/windows/CMakeLists.txt b/level_zero/tools/source/sysman/performance/windows/CMakeLists.txt index f98272a2ce..8b19c5c898 100644 --- a/level_zero/tools/source/sysman/performance/windows/CMakeLists.txt +++ b/level_zero/tools/source/sysman/performance/windows/CMakeLists.txt @@ -4,18 +4,11 @@ # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_PERFORMANCE_WINDOWS - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_performance_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_performance_imp.h -) - if(WIN32) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_PERFORMANCE_WINDOWS} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_performance_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_performance_imp.h ) endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_PERFORMANCE_WINDOWS ${L0_SRCS_TOOLS_SYSMAN_PERFORMANCE_WINDOWS}) diff --git a/level_zero/tools/source/sysman/power/CMakeLists.txt b/level_zero/tools/source/sysman/power/CMakeLists.txt index b0b89415c6..caa32c8f3b 100644 --- a/level_zero/tools/source/sysman/power/CMakeLists.txt +++ b/level_zero/tools/source/sysman/power/CMakeLists.txt @@ -1,24 +1,17 @@ # -# Copyright (C) 2020 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_POWER - ${CMAKE_CURRENT_SOURCE_DIR}/power.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/power.h - ${CMAKE_CURRENT_SOURCE_DIR}/power_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/power_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_power.h -) - target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_POWER} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/power.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/power.h + ${CMAKE_CURRENT_SOURCE_DIR}/power_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/power_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_power.h ) add_subdirectories() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_POWER ${L0_SRCS_TOOLS_SYSMAN_POWER}) diff --git a/level_zero/tools/source/sysman/power/linux/CMakeLists.txt b/level_zero/tools/source/sysman/power/linux/CMakeLists.txt index ddafb2cde9..7a660874d3 100644 --- a/level_zero/tools/source/sysman/power/linux/CMakeLists.txt +++ b/level_zero/tools/source/sysman/power/linux/CMakeLists.txt @@ -1,32 +1,27 @@ # -# Copyright (C) 2020-2022 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_POWER_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt -) - -if(NEO_ENABLE_i915_PRELIM_DETECTION) - list(APPEND L0_SRCS_TOOLS_SYSMAN_POWER_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/os_power_imp_prelim.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_power_imp_prelim.h - - ) -else() - list(APPEND L0_SRCS_TOOLS_SYSMAN_POWER_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/os_power_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_power_imp.h - ) -endif() - if(UNIX) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_POWER_LINUX} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ) -endif() -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_POWER_LINUX ${L0_SRCS_TOOLS_SYSMAN_POWER_LINUX}) + if(NEO_ENABLE_i915_PRELIM_DETECTION) + target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/os_power_imp_prelim.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_power_imp_prelim.h + + ) + else() + target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/os_power_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_power_imp.h + ) + endif() +endif() diff --git a/level_zero/tools/source/sysman/power/windows/CMakeLists.txt b/level_zero/tools/source/sysman/power/windows/CMakeLists.txt index 08441c1737..0fffd0dddc 100644 --- a/level_zero/tools/source/sysman/power/windows/CMakeLists.txt +++ b/level_zero/tools/source/sysman/power/windows/CMakeLists.txt @@ -1,21 +1,14 @@ # -# Copyright (C) 2020 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_POWER_WINDOWS - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_power_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_power_imp.cpp -) - if(WIN32) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_POWER_WINDOWS} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_power_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_power_imp.cpp ) endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_POWER_WINDOWS ${L0_SRCS_TOOLS_SYSMAN_POWER_WINDOWS}) diff --git a/level_zero/tools/source/sysman/ras/CMakeLists.txt b/level_zero/tools/source/sysman/ras/CMakeLists.txt index 64273b3641..208a2a4f5f 100644 --- a/level_zero/tools/source/sysman/ras/CMakeLists.txt +++ b/level_zero/tools/source/sysman/ras/CMakeLists.txt @@ -1,24 +1,17 @@ # -# Copyright (C) 2020 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_RAS - ${CMAKE_CURRENT_SOURCE_DIR}/ras.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/ras.h - ${CMAKE_CURRENT_SOURCE_DIR}/ras_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/ras_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_ras.h -) - target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_RAS} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_ras.h + ${CMAKE_CURRENT_SOURCE_DIR}/ras.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ras.h + ${CMAKE_CURRENT_SOURCE_DIR}/ras_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ras_imp.h ) add_subdirectories() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_RAS ${L0_SRCS_TOOLS_SYSMAN_RAS}) diff --git a/level_zero/tools/source/sysman/ras/linux/CMakeLists.txt b/level_zero/tools/source/sysman/ras/linux/CMakeLists.txt index d6401c31d1..abae3bed0e 100644 --- a/level_zero/tools/source/sysman/ras/linux/CMakeLists.txt +++ b/level_zero/tools/source/sysman/ras/linux/CMakeLists.txt @@ -4,31 +4,25 @@ # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_RAS_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt -) - -if(NEO_ENABLE_i915_PRELIM_DETECTION) - list(APPEND L0_SRCS_TOOLS_SYSMAN_RAS_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/os_ras_imp_prelim.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_ras_imp_prelim.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_ras_imp_gt.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_ras_imp_hbm.cpp - ) -else() - list(APPEND L0_SRCS_TOOLS_SYSMAN_RAS_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/os_ras_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_ras_imp.h - ) -endif() - if(UNIX) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_RAS_LINUX} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ) + + if(NEO_ENABLE_i915_PRELIM_DETECTION) + target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/os_ras_imp_prelim.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_ras_imp_prelim.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_ras_imp_gt.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_ras_imp_hbm.cpp + ) + else() + target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/os_ras_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_ras_imp.h + ) + endif() endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_RAS_LINUX ${L0_SRCS_TOOLS_SYSMAN_RAS_LINUX}) - diff --git a/level_zero/tools/source/sysman/ras/windows/CMakeLists.txt b/level_zero/tools/source/sysman/ras/windows/CMakeLists.txt index c6d42c20e0..e33a1c610e 100755 --- a/level_zero/tools/source/sysman/ras/windows/CMakeLists.txt +++ b/level_zero/tools/source/sysman/ras/windows/CMakeLists.txt @@ -1,19 +1,12 @@ # -# Copyright (C) 2020 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_RAS_WINDOWS - ${CMAKE_CURRENT_SOURCE_DIR}/os_ras_imp.cpp -) - if(WIN32) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_RAS_WINDOWS} + ${CMAKE_CURRENT_SOURCE_DIR}/os_ras_imp.cpp ) endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_RAS_WINDOWS ${L0_SRCS_TOOLS_SYSMAN_RAS_WINDOWS}) diff --git a/level_zero/tools/source/sysman/scheduler/CMakeLists.txt b/level_zero/tools/source/sysman/scheduler/CMakeLists.txt index a7c566a8bc..b60aaaab2d 100644 --- a/level_zero/tools/source/sysman/scheduler/CMakeLists.txt +++ b/level_zero/tools/source/sysman/scheduler/CMakeLists.txt @@ -1,24 +1,17 @@ # -# Copyright (C) 2020 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_SCHEDULER - ${CMAKE_CURRENT_SOURCE_DIR}/scheduler.h - ${CMAKE_CURRENT_SOURCE_DIR}/scheduler.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/scheduler_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/scheduler_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_scheduler.h -) - target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_SCHEDULER} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_scheduler.h + ${CMAKE_CURRENT_SOURCE_DIR}/scheduler.h + ${CMAKE_CURRENT_SOURCE_DIR}/scheduler.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/scheduler_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/scheduler_imp.h ) add_subdirectories() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_SCHEDULER ${L0_SRCS_TOOLS_SYSMAN_SCHEDULER}) diff --git a/level_zero/tools/source/sysman/scheduler/linux/CMakeLists.txt b/level_zero/tools/source/sysman/scheduler/linux/CMakeLists.txt index 455dba0c7c..57fdc08a2a 100644 --- a/level_zero/tools/source/sysman/scheduler/linux/CMakeLists.txt +++ b/level_zero/tools/source/sysman/scheduler/linux/CMakeLists.txt @@ -1,30 +1,25 @@ # -# Copyright (C) 2020-2022 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_SCHEDULER_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_scheduler_imp.h -) - -if(NEO_ENABLE_i915_PRELIM_DETECTION) - list(APPEND L0_SRCS_TOOLS_SYSMAN_SCHEDULER_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/os_scheduler_imp_prelim.cpp - ) -else() - list(APPEND L0_SRCS_TOOLS_SYSMAN_SCHEDULER_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/os_scheduler_imp.cpp - ) -endif() - if(UNIX) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_SCHEDULER_LINUX} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_scheduler_imp.h ) -endif() -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_SCHEDULER_LINUX ${L0_SRCS_TOOLS_SYSMAN_SCHEDULER_LINUX}) + if(NEO_ENABLE_i915_PRELIM_DETECTION) + target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/os_scheduler_imp_prelim.cpp + ) + else() + target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/os_scheduler_imp.cpp + ) + endif() +endif() diff --git a/level_zero/tools/source/sysman/scheduler/windows/CMakeLists.txt b/level_zero/tools/source/sysman/scheduler/windows/CMakeLists.txt index 06359d53e9..22c8912761 100644 --- a/level_zero/tools/source/sysman/scheduler/windows/CMakeLists.txt +++ b/level_zero/tools/source/sysman/scheduler/windows/CMakeLists.txt @@ -1,21 +1,14 @@ # -# Copyright (C) 2020 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_SCHEDULER_WINDOWS - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_scheduler_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_scheduler_imp.cpp -) - if(WIN32) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_SCHEDULER_WINDOWS} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_scheduler_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_scheduler_imp.cpp ) endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_SCHEDULER_WINDOWS ${L0_SRCS_TOOLS_SYSMAN_SCHEDULER_WINDOWS}) diff --git a/level_zero/tools/source/sysman/standby/CMakeLists.txt b/level_zero/tools/source/sysman/standby/CMakeLists.txt index f8ebb8df17..15456eed08 100644 --- a/level_zero/tools/source/sysman/standby/CMakeLists.txt +++ b/level_zero/tools/source/sysman/standby/CMakeLists.txt @@ -1,28 +1,17 @@ # -# Copyright (C) 2020-2021 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_STANDBY - ${CMAKE_CURRENT_SOURCE_DIR}/standby.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/standby.h - ${CMAKE_CURRENT_SOURCE_DIR}/standby_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/standby_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_standby.h -) - target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_STANDBY} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_standby.h + ${CMAKE_CURRENT_SOURCE_DIR}/standby.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/standby.h + ${CMAKE_CURRENT_SOURCE_DIR}/standby_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/standby_imp.h ) -if(UNIX) - add_subdirectory(linux) -else() - add_subdirectory(windows) -endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_STANDBY ${L0_SRCS_TOOLS_SYSMAN_STANDBY}) +add_subdirectories() diff --git a/level_zero/tools/source/sysman/standby/linux/CMakeLists.txt b/level_zero/tools/source/sysman/standby/linux/CMakeLists.txt index d76013d1ef..f7862ebd18 100644 --- a/level_zero/tools/source/sysman/standby/linux/CMakeLists.txt +++ b/level_zero/tools/source/sysman/standby/linux/CMakeLists.txt @@ -1,21 +1,14 @@ # -# Copyright (C) 2020-2021 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_STANDBY_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_standby_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_standby_imp.h -) - if(UNIX) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_STANDBY_LINUX} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_standby_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_standby_imp.h ) endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_STANDBY_LINUX ${L0_SRCS_TOOLS_SYSMAN_STANDBY_LINUX}) diff --git a/level_zero/tools/source/sysman/standby/windows/CMakeLists.txt b/level_zero/tools/source/sysman/standby/windows/CMakeLists.txt index 8e4ffd8b91..a1b1fc620e 100644 --- a/level_zero/tools/source/sysman/standby/windows/CMakeLists.txt +++ b/level_zero/tools/source/sysman/standby/windows/CMakeLists.txt @@ -1,20 +1,13 @@ # -# Copyright (C) 2020-2021 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_STANDBY_WINDOWS - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_standby_imp.cpp -) - if(WIN32) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_STANDBY_WINDOWS} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_standby_imp.cpp ) endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_STANDBY_WINDOWS ${L0_SRCS_TOOLS_SYSMAN_STANDBY_WINDOWS}) diff --git a/level_zero/tools/source/sysman/temperature/CMakeLists.txt b/level_zero/tools/source/sysman/temperature/CMakeLists.txt index 552864034c..75f83c35e9 100644 --- a/level_zero/tools/source/sysman/temperature/CMakeLists.txt +++ b/level_zero/tools/source/sysman/temperature/CMakeLists.txt @@ -1,24 +1,17 @@ # -# Copyright (C) 2020 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_TEMPERATURE - ${CMAKE_CURRENT_SOURCE_DIR}/temperature.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/temperature.h - ${CMAKE_CURRENT_SOURCE_DIR}/temperature_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/temperature_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_temperature.h -) - target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_TEMPERATURE} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_temperature.h + ${CMAKE_CURRENT_SOURCE_DIR}/temperature.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/temperature.h + ${CMAKE_CURRENT_SOURCE_DIR}/temperature_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/temperature_imp.h ) add_subdirectories() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_TEMPERATURE ${L0_SRCS_TOOLS_SYSMAN_TEMPERATURE}) diff --git a/level_zero/tools/source/sysman/temperature/linux/CMakeLists.txt b/level_zero/tools/source/sysman/temperature/linux/CMakeLists.txt index 35192da9fd..9eb8667664 100644 --- a/level_zero/tools/source/sysman/temperature/linux/CMakeLists.txt +++ b/level_zero/tools/source/sysman/temperature/linux/CMakeLists.txt @@ -1,21 +1,14 @@ # -# Copyright (C) 2020-2022 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_TEMPERATURE_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_temperature_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_temperature_imp.h -) - if(UNIX) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_TEMPERATURE_LINUX} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_temperature_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_temperature_imp.h ) endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_TEMPERATURE_LINUX ${L0_SRCS_TOOLS_SYSMAN_TEMPERATURE_LINUX}) diff --git a/level_zero/tools/source/sysman/temperature/windows/CMakeLists.txt b/level_zero/tools/source/sysman/temperature/windows/CMakeLists.txt index e02de88a85..98194ab115 100644 --- a/level_zero/tools/source/sysman/temperature/windows/CMakeLists.txt +++ b/level_zero/tools/source/sysman/temperature/windows/CMakeLists.txt @@ -1,21 +1,14 @@ # -# Copyright (C) 2020 Intel Corporation +# Copyright (C) 2020-2023 Intel Corporation # # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_TEMPERATURE_WINDOWS - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_temperature_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_temperature_imp.cpp -) - if(WIN32) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_TEMPERATURE_WINDOWS} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_temperature_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_temperature_imp.cpp ) endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_TEMPERATURE_WINDOWS ${L0_SRCS_TOOLS_SYSMAN_TEMPERATURE_WINDOWS}) diff --git a/level_zero/tools/source/sysman/windows/CMakeLists.txt b/level_zero/tools/source/sysman/windows/CMakeLists.txt index 52cb116120..87eea01d8f 100644 --- a/level_zero/tools/source/sysman/windows/CMakeLists.txt +++ b/level_zero/tools/source/sysman/windows/CMakeLists.txt @@ -4,23 +4,16 @@ # SPDX-License-Identifier: MIT # -set(L0_SRCS_TOOLS_SYSMAN_WINDOWS - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/kmd_sys.h - ${CMAKE_CURRENT_SOURCE_DIR}/kmd_sys_manager.h - ${CMAKE_CURRENT_SOURCE_DIR}/kmd_sys_manager.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_driver_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_driver_imp.h -) - if(WIN32) target_sources(${L0_STATIC_LIB_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_WINDOWS} + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/kmd_sys.h + ${CMAKE_CURRENT_SOURCE_DIR}/kmd_sys_manager.h + ${CMAKE_CURRENT_SOURCE_DIR}/kmd_sys_manager.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_driver_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_driver_imp.h ) endif() - -# Make our source files visible to parent -set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_WINDOWS ${L0_SRCS_TOOLS_SYSMAN_WINDOWS}) diff --git a/level_zero/tools/test/unit_tests/sources/sysman/firmware_util/CMakeLists.txt b/level_zero/tools/test/unit_tests/sources/sysman/firmware_util/CMakeLists.txt index 0d40e5d9b6..9213fa008b 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/firmware_util/CMakeLists.txt +++ b/level_zero/tools/test/unit_tests/sources/sysman/firmware_util/CMakeLists.txt @@ -1,18 +1,14 @@ # -# Copyright (C) 2022 Intel Corporation +# Copyright (C) 2022-2023 Intel Corporation # # SPDX-License-Identifier: MIT # if(igsc_FOUND) - set(L0_SRCS_TOOLS_SYSMAN_LINUX_FIRMWARE_UTIL_TEST - ${CMAKE_CURRENT_SOURCE_DIR}/test_fw_util.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/mock_fw_util_fixture.h - ${CMAKE_CURRENT_SOURCE_DIR}/test_fw_util_helper.cpp + target_sources(${TARGET_NAME} PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/test_fw_util.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/mock_fw_util_fixture.h + ${CMAKE_CURRENT_SOURCE_DIR}/test_fw_util_helper.cpp ) endif() -target_sources(${TARGET_NAME} PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_LINUX_FIRMWARE_UTIL_TEST} -) -