Skip to content

Commit 5dbf8f7

Browse files
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 <[email protected]>
1 parent e6930c4 commit 5dbf8f7

File tree

12 files changed

+17
-17
lines changed

12 files changed

+17
-17
lines changed

elf/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#
2-
# Copyright (C) 2017-2018 Intel Corporation
2+
# Copyright (C) 2017-2019 Intel Corporation
33
#
44
# SPDX-License-Identifier: MIT
55
#
66

7-
add_library(elflib STATIC
7+
add_library(elflib STATIC EXCLUDE_FROM_ALL
88
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
99
${CMAKE_CURRENT_SOURCE_DIR}/reader.cpp
1010
${CMAKE_CURRENT_SOURCE_DIR}/reader.h

manifests/manifest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ components:
1717
branch: infra
1818
clean_on_sync: true
1919
dest_dir: infra
20-
revision: 29904f3e4e91a65d6742f992ffac18516cf2371b
20+
revision: 6c3e17d837fd442529790e0167158ed3de4b5b71
2121
type: git
2222
internal:
2323
branch: master

runtime/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ hide_subdir(builtin_kernels_simulation)
2323
hide_subdir(dll)
2424
hide_subdir(instrumentation)
2525

26-
add_library(${NEO_STATIC_LIB_NAME} STATIC
26+
add_library(${NEO_STATIC_LIB_NAME} STATIC EXCLUDE_FROM_ALL
2727
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
2828
${CMAKE_CURRENT_SOURCE_DIR}/enable_gens.cmake
2929
$<TARGET_OBJECTS:${BIKSIM_LIB_NAME}>

runtime/built_ins/builtins_binary.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# SPDX-License-Identifier: MIT
55
#
66

7-
add_library(${BUILTINS_BINARIES_LIB_NAME} OBJECT builtins_binary.cmake)
7+
add_library(${BUILTINS_BINARIES_LIB_NAME} OBJECT EXCLUDE_FROM_ALL builtins_binary.cmake)
88

99
# Add builtins sources
1010
add_subdirectory(registry)

runtime/built_ins/registry/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# SPDX-License-Identifier: MIT
55
#
66

7-
add_library(${BUILTINS_SOURCES_LIB_NAME} OBJECT
7+
add_library(${BUILTINS_SOURCES_LIB_NAME} OBJECT EXCLUDE_FROM_ALL
88
CMakeLists.txt
99
built_ins_registry.h
1010
register_copy_kernels_source.cpp

runtime/builtin_kernels_simulation/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ endmacro()
4242

4343
apply_macro_for_each_gen("SUPPORTED")
4444

45-
add_library(${BIKSIM_LIB_NAME} OBJECT ${BUILTIN_KERNELS_SIMULATION_SRCS})
45+
add_library(${BIKSIM_LIB_NAME} OBJECT EXCLUDE_FROM_ALL ${BUILTIN_KERNELS_SIMULATION_SRCS})
4646
target_include_directories(${BIKSIM_LIB_NAME} BEFORE PRIVATE
4747
${ENGINE_NODE_DIR}
4848
${UMKM_SHAREDDATA_INCLUDE_PATHS}

runtime/scheduler/scheduler_binary.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ endmacro()
7272

7373
apply_macro_for_each_gen("SUPPORTED")
7474

75-
add_library(${SCHEDULER_BINARY_LIB_NAME} OBJECT CMakeLists.txt)
75+
add_library(${SCHEDULER_BINARY_LIB_NAME} OBJECT EXCLUDE_FROM_ALL CMakeLists.txt)
7676

7777
if(COMPILE_BUILT_INS)
7878
target_sources(${SCHEDULER_BINARY_LIB_NAME} PUBLIC ${GENERATED_SCHEDULER_CPPS})

runtime/sharings/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#
2-
# Copyright (C) 2018 Intel Corporation
2+
# Copyright (C) 2018-2019 Intel Corporation
33
#
44
# SPDX-License-Identifier: MIT
55
#
66

77
file(GLOB_RECURSE SHARING_ENABLE_CPPS enable*.cpp)
8-
add_library (${SHARINGS_ENABLE_LIB_NAME} OBJECT ${SHARING_ENABLE_CPPS})
8+
add_library (${SHARINGS_ENABLE_LIB_NAME} OBJECT EXCLUDE_FROM_ALL ${SHARING_ENABLE_CPPS})
99
set_target_properties (${SHARINGS_ENABLE_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
1010
set_target_properties (${SHARINGS_ENABLE_LIB_NAME} PROPERTIES FOLDER "opencl runtime")
1111

third_party/gtest/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# SPDX-License-Identifier: MIT
55
#
66

7-
add_library(gmock-gtest STATIC
7+
add_library(gmock-gtest STATIC EXCLUDE_FROM_ALL
88
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
99
${CMAKE_CURRENT_SOURCE_DIR}/gmock-gtest-all.cc
1010
${CMAKE_CURRENT_SOURCE_DIR}/gtest/gtest.h

unit_tests/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ set(NEO_IGDRCL_TESTS__TARGET_OBJECTS
8181
)
8282

8383
if(DEFINED AUB_STREAM_DIR)
84-
add_library (aub_stream_mock_lib OBJECT
84+
add_library (aub_stream_mock_lib OBJECT EXCLUDE_FROM_ALL
8585
${IGDRCL_SOURCE_DIR}/unit_tests/aub_stream_mocks/aub_stream_interface_mock.cpp
8686
)
8787
list(APPEND NEO_IGDRCL_TESTS__TARGET_OBJECTS
@@ -482,7 +482,7 @@ elseif(USE_ULT_PCH)
482482
set(UltPchBinaryGch "${UltPchHeaderInBuildDir}.gch")
483483
set(UltPchBinary "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/igdrcl_ult_pch.dir/igdrcl_tests_pch.h.o")
484484

485-
add_library(igdrcl_ult_pch STATIC ${UltPchHeader})
485+
add_library(igdrcl_ult_pch STATIC EXCLUDE_FROM_ALL ${UltPchHeader})
486486
add_dependencies(igdrcl_tests igdrcl_ult_pch)
487487

488488
target_include_directories(igdrcl_ult_pch PRIVATE

0 commit comments

Comments
 (0)