Skip to content

Commit cbff467

Browse files
Add Flags to top level CMake
Change-Id: Iee2be4323320998026a55939b2aa6155bd0b80f9 Signed-off-by: Maciej Plewka <[email protected]>
1 parent dbbd488 commit cbff467

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

CMakeLists.txt

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ if(NOT DEFINED IGDRCL_SOURCE_DIR)
7171
set(IGDRCL_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
7272
endif()
7373

74+
if(SKIP_ALL_ULT)
75+
set(SKIP_UNIT_TESTS TRUE)
76+
endif()
77+
7478
# Set our build directory
7579
if(NOT DEFINED IGDRCL_BUILD_DIR)
7680
set(IGDRCL_BUILD_DIR ${CMAKE_BINARY_DIR})
@@ -700,8 +704,11 @@ macro(generate_runtime_lib LIB_NAME MOCKABLE GENERATE_EXEC)
700704
set(NEO_STATIC_LIB_NAME ${LIB_NAME})
701705
set(SHARINGS_ENABLE_LIB_NAME "${LIB_NAME}_sharings_enable")
702706
set(GENERATE_EXECUTABLE ${GENERATE_EXEC})
703-
704-
add_subdirectory(runtime "${IGDRCL_BUILD_DIR}/${LIB_NAME}")
707+
if(NOT BUILD_WITHOUT_RUNTIME)
708+
add_subdirectory(runtime "${IGDRCL_BUILD_DIR}/${LIB_NAME}")
709+
else()
710+
add_subdirectory(runtime "${IGDRCL_BUILD_DIR}/${LIB_NAME}" EXCLUDE_FROM_ALL)
711+
endif()
705712
target_compile_definitions(${BUILTINS_SOURCES_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=)
706713
target_compile_definitions(${BUILTINS_BINARIES_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=)
707714
target_compile_definitions(${SCHEDULER_BINARY_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=)
@@ -735,7 +742,7 @@ if(DONT_CARE_OF_VIRTUALS)
735742
else()
736743
set(NEO_RELEASE_LIB_NAME "igdrcl_lib_release") # Used by dll/so
737744
generate_runtime_lib(${NEO_RELEASE_LIB_NAME} FALSE TRUE)
738-
if(NOT SKIP_UNIT_TESTS)
745+
if(NOT SKIP_ALL_ULT)
739746
set(NEO_MOCKABLE_LIB_NAME "igdrcl_lib_mockable") # Used by ULTS
740747
generate_runtime_lib(${NEO_MOCKABLE_LIB_NAME} TRUE FALSE)
741748
endif()

unit_tests/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,7 @@ macro(macro_for_each_gen)
451451
endmacro()
452452
apply_macro_for_each_gen("TESTED")
453453
add_subdirectories()
454+
add_dependencies(unit_tests mock_gmm)
454455
create_project_source_tree(igdrcl_tests ${IGDRCL_SOURCE_DIR}/runtime)
455456

456457
set(UltPchHeader "${CMAKE_CURRENT_SOURCE_DIR}/igdrcl_tests_pch.h")

unit_tests/mock_gmm/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (C) 2018 Intel Corporation
2+
# Copyright (C) 2018-2019 Intel Corporation
33
#
44
# SPDX-License-Identifier: MIT
55
#
@@ -31,5 +31,4 @@ set_target_properties(
3131
create_project_source_tree(${target_name})
3232
set_target_properties(${target_name} PROPERTIES FOLDER "test mocks")
3333
target_compile_definitions(${target_name} PUBLIC)
34-
add_dependencies(unit_tests ${target_name})
3534

0 commit comments

Comments
 (0)