From cbff467d6a98e6266118553baab0fa01ffe4f526 Mon Sep 17 00:00:00 2001
From: Maciej Plewka <maciej.plewka@intel.com>
Date: Thu, 6 Jun 2019 12:31:39 +0200
Subject: [PATCH] Add Flags to top level CMake

Change-Id: Iee2be4323320998026a55939b2aa6155bd0b80f9
Signed-off-by: Maciej Plewka <maciej.plewka@intel.com>
---
 CMakeLists.txt                     | 13 ++++++++++---
 unit_tests/CMakeLists.txt          |  1 +
 unit_tests/mock_gmm/CMakeLists.txt |  3 +--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f77a2b898a..b108b7ce04 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,6 +71,10 @@ if(NOT DEFINED IGDRCL_SOURCE_DIR)
   set(IGDRCL_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 endif()
 
+if(SKIP_ALL_ULT)
+    set(SKIP_UNIT_TESTS TRUE)
+endif()
+
 # Set our build directory
 if(NOT DEFINED IGDRCL_BUILD_DIR)
   set(IGDRCL_BUILD_DIR ${CMAKE_BINARY_DIR})
@@ -700,8 +704,11 @@ macro(generate_runtime_lib LIB_NAME MOCKABLE GENERATE_EXEC)
 	set(NEO_STATIC_LIB_NAME ${LIB_NAME})
 	set(SHARINGS_ENABLE_LIB_NAME "${LIB_NAME}_sharings_enable")
 	set(GENERATE_EXECUTABLE ${GENERATE_EXEC})
-
-	add_subdirectory(runtime "${IGDRCL_BUILD_DIR}/${LIB_NAME}")
+	if(NOT BUILD_WITHOUT_RUNTIME)
+		add_subdirectory(runtime "${IGDRCL_BUILD_DIR}/${LIB_NAME}")
+	else()
+		add_subdirectory(runtime "${IGDRCL_BUILD_DIR}/${LIB_NAME}" EXCLUDE_FROM_ALL)
+	endif()
 	target_compile_definitions(${BUILTINS_SOURCES_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=)
 	target_compile_definitions(${BUILTINS_BINARIES_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=)
 	target_compile_definitions(${SCHEDULER_BINARY_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=)
@@ -735,7 +742,7 @@ if(DONT_CARE_OF_VIRTUALS)
 else()
     set(NEO_RELEASE_LIB_NAME "igdrcl_lib_release") # Used by dll/so
     generate_runtime_lib(${NEO_RELEASE_LIB_NAME} FALSE TRUE)
-    if(NOT SKIP_UNIT_TESTS)
+    if(NOT SKIP_ALL_ULT)
         set(NEO_MOCKABLE_LIB_NAME "igdrcl_lib_mockable") # Used by ULTS
         generate_runtime_lib(${NEO_MOCKABLE_LIB_NAME} TRUE FALSE)
     endif()
diff --git a/unit_tests/CMakeLists.txt b/unit_tests/CMakeLists.txt
index 9a62fba411..fbc0a55f0b 100644
--- a/unit_tests/CMakeLists.txt
+++ b/unit_tests/CMakeLists.txt
@@ -451,6 +451,7 @@ macro(macro_for_each_gen)
 endmacro()
 apply_macro_for_each_gen("TESTED")
 add_subdirectories()
+add_dependencies(unit_tests mock_gmm)
 create_project_source_tree(igdrcl_tests ${IGDRCL_SOURCE_DIR}/runtime)
 
 set(UltPchHeader "${CMAKE_CURRENT_SOURCE_DIR}/igdrcl_tests_pch.h")
diff --git a/unit_tests/mock_gmm/CMakeLists.txt b/unit_tests/mock_gmm/CMakeLists.txt
index 6569cbe440..e3ed451d69 100644
--- a/unit_tests/mock_gmm/CMakeLists.txt
+++ b/unit_tests/mock_gmm/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018 Intel Corporation
+# Copyright (C) 2018-2019 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -31,5 +31,4 @@ set_target_properties(
 create_project_source_tree(${target_name})
 set_target_properties(${target_name} PROPERTIES FOLDER "test mocks")
 target_compile_definitions(${target_name} PUBLIC)
-add_dependencies(unit_tests ${target_name})