From 5dbf8f7b8d4d89524790e7b18abdb97b7e365b36 Mon Sep 17 00:00:00 2001 From: Artur Harasimiuk Date: Mon, 24 Jun 2019 13:48:14 +0200 Subject: [PATCH] cmake: adding EXCLUDE_FROM_ALL to intermediate libraries These targets should be built on demand when another target requires this or explicitly requested. This applies to STATIC and OBJECT libraries. Change-Id: Ia0eb4e803b09c0ce594fd348ad53c10cdf5b3a9f Signed-off-by: Artur Harasimiuk --- elf/CMakeLists.txt | 4 ++-- manifests/manifest.yml | 2 +- runtime/CMakeLists.txt | 2 +- runtime/built_ins/builtins_binary.cmake | 2 +- runtime/built_ins/registry/CMakeLists.txt | 2 +- runtime/builtin_kernels_simulation/CMakeLists.txt | 2 +- runtime/scheduler/scheduler_binary.cmake | 2 +- runtime/sharings/CMakeLists.txt | 4 ++-- third_party/gtest/CMakeLists.txt | 2 +- unit_tests/CMakeLists.txt | 4 ++-- unit_tests/libult/CMakeLists.txt | 6 +++--- unit_tests/mocks/CMakeLists.txt | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/elf/CMakeLists.txt b/elf/CMakeLists.txt index bce4b32249..a9eac4e8ff 100644 --- a/elf/CMakeLists.txt +++ b/elf/CMakeLists.txt @@ -1,10 +1,10 @@ # -# Copyright (C) 2017-2018 Intel Corporation +# Copyright (C) 2017-2019 Intel Corporation # # SPDX-License-Identifier: MIT # -add_library(elflib STATIC +add_library(elflib STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/reader.cpp ${CMAKE_CURRENT_SOURCE_DIR}/reader.h diff --git a/manifests/manifest.yml b/manifests/manifest.yml index 0b7eb9047b..24c6113d02 100644 --- a/manifests/manifest.yml +++ b/manifests/manifest.yml @@ -17,7 +17,7 @@ components: branch: infra clean_on_sync: true dest_dir: infra - revision: 29904f3e4e91a65d6742f992ffac18516cf2371b + revision: 6c3e17d837fd442529790e0167158ed3de4b5b71 type: git internal: branch: master diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index 770674e833..49758bd132 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -23,7 +23,7 @@ hide_subdir(builtin_kernels_simulation) hide_subdir(dll) hide_subdir(instrumentation) -add_library(${NEO_STATIC_LIB_NAME} STATIC +add_library(${NEO_STATIC_LIB_NAME} STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/enable_gens.cmake $ diff --git a/runtime/built_ins/builtins_binary.cmake b/runtime/built_ins/builtins_binary.cmake index 9e28b2a3b1..134a5b51aa 100644 --- a/runtime/built_ins/builtins_binary.cmake +++ b/runtime/built_ins/builtins_binary.cmake @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT # -add_library(${BUILTINS_BINARIES_LIB_NAME} OBJECT builtins_binary.cmake) +add_library(${BUILTINS_BINARIES_LIB_NAME} OBJECT EXCLUDE_FROM_ALL builtins_binary.cmake) # Add builtins sources add_subdirectory(registry) diff --git a/runtime/built_ins/registry/CMakeLists.txt b/runtime/built_ins/registry/CMakeLists.txt index 0203c2bdde..bba73d513a 100644 --- a/runtime/built_ins/registry/CMakeLists.txt +++ b/runtime/built_ins/registry/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT # -add_library(${BUILTINS_SOURCES_LIB_NAME} OBJECT +add_library(${BUILTINS_SOURCES_LIB_NAME} OBJECT EXCLUDE_FROM_ALL CMakeLists.txt built_ins_registry.h register_copy_kernels_source.cpp diff --git a/runtime/builtin_kernels_simulation/CMakeLists.txt b/runtime/builtin_kernels_simulation/CMakeLists.txt index fb933ec7f6..9c26ee506c 100644 --- a/runtime/builtin_kernels_simulation/CMakeLists.txt +++ b/runtime/builtin_kernels_simulation/CMakeLists.txt @@ -42,7 +42,7 @@ endmacro() apply_macro_for_each_gen("SUPPORTED") -add_library(${BIKSIM_LIB_NAME} OBJECT ${BUILTIN_KERNELS_SIMULATION_SRCS}) +add_library(${BIKSIM_LIB_NAME} OBJECT EXCLUDE_FROM_ALL ${BUILTIN_KERNELS_SIMULATION_SRCS}) target_include_directories(${BIKSIM_LIB_NAME} BEFORE PRIVATE ${ENGINE_NODE_DIR} ${UMKM_SHAREDDATA_INCLUDE_PATHS} diff --git a/runtime/scheduler/scheduler_binary.cmake b/runtime/scheduler/scheduler_binary.cmake index 1b12592b00..6d2143732f 100644 --- a/runtime/scheduler/scheduler_binary.cmake +++ b/runtime/scheduler/scheduler_binary.cmake @@ -72,7 +72,7 @@ endmacro() apply_macro_for_each_gen("SUPPORTED") -add_library(${SCHEDULER_BINARY_LIB_NAME} OBJECT CMakeLists.txt) +add_library(${SCHEDULER_BINARY_LIB_NAME} OBJECT EXCLUDE_FROM_ALL CMakeLists.txt) if(COMPILE_BUILT_INS) target_sources(${SCHEDULER_BINARY_LIB_NAME} PUBLIC ${GENERATED_SCHEDULER_CPPS}) diff --git a/runtime/sharings/CMakeLists.txt b/runtime/sharings/CMakeLists.txt index 64dfebc3da..b1413e6c55 100644 --- a/runtime/sharings/CMakeLists.txt +++ b/runtime/sharings/CMakeLists.txt @@ -1,11 +1,11 @@ # -# Copyright (C) 2018 Intel Corporation +# Copyright (C) 2018-2019 Intel Corporation # # SPDX-License-Identifier: MIT # file(GLOB_RECURSE SHARING_ENABLE_CPPS enable*.cpp) -add_library (${SHARINGS_ENABLE_LIB_NAME} OBJECT ${SHARING_ENABLE_CPPS}) +add_library (${SHARINGS_ENABLE_LIB_NAME} OBJECT EXCLUDE_FROM_ALL ${SHARING_ENABLE_CPPS}) set_target_properties (${SHARINGS_ENABLE_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON) set_target_properties (${SHARINGS_ENABLE_LIB_NAME} PROPERTIES FOLDER "opencl runtime") diff --git a/third_party/gtest/CMakeLists.txt b/third_party/gtest/CMakeLists.txt index b93816eeae..1ccb960ad1 100644 --- a/third_party/gtest/CMakeLists.txt +++ b/third_party/gtest/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT # -add_library(gmock-gtest STATIC +add_library(gmock-gtest STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/gmock-gtest-all.cc ${CMAKE_CURRENT_SOURCE_DIR}/gtest/gtest.h diff --git a/unit_tests/CMakeLists.txt b/unit_tests/CMakeLists.txt index fab1da5aaa..1a0e857a78 100644 --- a/unit_tests/CMakeLists.txt +++ b/unit_tests/CMakeLists.txt @@ -81,7 +81,7 @@ set(NEO_IGDRCL_TESTS__TARGET_OBJECTS ) if(DEFINED AUB_STREAM_DIR) - add_library (aub_stream_mock_lib OBJECT + add_library (aub_stream_mock_lib OBJECT EXCLUDE_FROM_ALL ${IGDRCL_SOURCE_DIR}/unit_tests/aub_stream_mocks/aub_stream_interface_mock.cpp ) list(APPEND NEO_IGDRCL_TESTS__TARGET_OBJECTS @@ -482,7 +482,7 @@ elseif(USE_ULT_PCH) set(UltPchBinaryGch "${UltPchHeaderInBuildDir}.gch") set(UltPchBinary "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/igdrcl_ult_pch.dir/igdrcl_tests_pch.h.o") - add_library(igdrcl_ult_pch STATIC ${UltPchHeader}) + add_library(igdrcl_ult_pch STATIC EXCLUDE_FROM_ALL ${UltPchHeader}) add_dependencies(igdrcl_tests igdrcl_ult_pch) target_include_directories(igdrcl_ult_pch PRIVATE diff --git a/unit_tests/libult/CMakeLists.txt b/unit_tests/libult/CMakeLists.txt index 38f1d5f568..fd5fb5bc2f 100644 --- a/unit_tests/libult/CMakeLists.txt +++ b/unit_tests/libult/CMakeLists.txt @@ -41,7 +41,7 @@ set(IGDRCL_SRCS_LIB_ULT_WINDOWS ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/mock_environment_variables.cpp ) -add_library (igdrcl_libult OBJECT +add_library (igdrcl_libult OBJECT EXCLUDE_FROM_ALL ${IGDRCL_SRCS_LIB_ULT} ${IGDRCL_SRCS_ENABLE_TESTED_HW} ) @@ -53,7 +53,7 @@ set(IGDRCL_SRCS_LIB_ULT_CS ${IGDRCL_SOURCE_DIR}/unit_tests/libult/create_command_stream.cpp ${IGDRCL_SOURCE_DIR}/unit_tests/libult/create_command_stream.h ) -add_library (igdrcl_libult_cs OBJECT +add_library (igdrcl_libult_cs OBJECT EXCLUDE_FROM_ALL ${IGDRCL_SRCS_LIB_ULT_CS} ) target_include_directories(igdrcl_libult PRIVATE @@ -88,7 +88,7 @@ set(IGDRCL_SRCS_LIB_ULT_ENV ${IGDRCL_SOURCE_DIR}/unit_tests/ult_config_listener.cpp ${IGDRCL_SOURCE_DIR}/unit_tests/ult_config_listener.h ) -add_library (igdrcl_libult_env OBJECT +add_library (igdrcl_libult_env OBJECT EXCLUDE_FROM_ALL ${IGDRCL_SRCS_LIB_ULT_ENV} ) diff --git a/unit_tests/mocks/CMakeLists.txt b/unit_tests/mocks/CMakeLists.txt index 57e0fe6c43..b2ba9abfae 100644 --- a/unit_tests/mocks/CMakeLists.txt +++ b/unit_tests/mocks/CMakeLists.txt @@ -99,7 +99,7 @@ endif() add_subdirectories() -add_library(igdrcl_mocks STATIC ${IGDRCL_SRCS_tests_mocks}) +add_library(igdrcl_mocks STATIC EXCLUDE_FROM_ALL ${IGDRCL_SRCS_tests_mocks}) if(WIN32) target_include_directories(igdrcl_mocks PUBLIC