CMake: rename IGDRCL_SOURCE_DIR to NEO_SOURCE_DIR

use NEO_SOURCE_DIR instead of CMAKE_SOURCE_DIR

Change-Id: Ib3774c80147941ded6bc884d83407461c89e7b8e
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>

Author: JablonskiMateusz

CMakeLists.txt

@@ -86,8 +86,8 @@ endif("${BUILD_TYPE_lower}" STREQUAL "releaseinternal")
 message(STATUS "${CMAKE_BUILD_TYPE} build configuration")
 
 # Set the runtime source directory
-if(NOT DEFINED IGDRCL_SOURCE_DIR)
-  set(IGDRCL_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+if(NOT DEFINED NEO_SOURCE_DIR)
+  set(NEO_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 endif()
 
 # Set the core source directory
@@ -167,7 +167,7 @@ if(DISABLE_AUB_STREAM)
     unset(AUB_STREAM_DIR)
 endif()
 
-get_filename_component(I915_INCLUDES_DIR "${IGDRCL_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}/uapi" ABSOLUTE)
+get_filename_component(I915_INCLUDES_DIR "${NEO_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}/uapi" ABSOLUTE)
 message(STATUS "i915 includes dir: ${I915_INCLUDES_DIR}")
 
 if(NOT DEFINED KHRONOS_HEADERS_DIR)
@@ -245,7 +245,7 @@ if(NOT IGC__IGC_TARGETS)
     if(DEFINED IGC_DIR)
         get_filename_component(IGC_DIR "${IGC_DIR}" ABSOLUTE)
     else()
-        get_filename_component(IGC_DIR_tmp "${CMAKE_SOURCE_DIR}/../igc" ABSOLUTE)
+        get_filename_component(IGC_DIR_tmp "${NEO_SOURCE_DIR}/../igc" ABSOLUTE)
         if(IS_DIRECTORY "${IGC_DIR_tmp}")
             set(IGC_DIR "${IGC_DIR_tmp}")
         endif()
@@ -359,7 +359,7 @@ if(NOT DEFINED GMMUMD_LIB_NAME)
     if(DEFINED GMM_SOURCE_DIR)
       get_filename_component(GMM_SOURCE_DIR "${GMM_SOURCE_DIR}" ABSOLUTE)
     else()
-      get_filename_component(GMM_SOURCE_DIR_tmp "${CMAKE_SOURCE_DIR}/../gmmlib" ABSOLUTE)
+      get_filename_component(GMM_SOURCE_DIR_tmp "${NEO_SOURCE_DIR}/../gmmlib" ABSOLUTE)
       if(IS_DIRECTORY "${GMM_SOURCE_DIR_tmp}")
         set(GMM_SOURCE_DIR "${GMM_SOURCE_DIR_tmp}")
       endif()
@@ -429,7 +429,7 @@ if(NOT DEFINED INSTRUMENTATION_LIB_NAME)
   if(DEFINED INSTRUMENTATION_SOURCE_DIR)
     get_filename_component(INSTRUMENTATION_SOURCE_DIR "${INSTRUMENTATION_SOURCE_DIR}" ABSOLUTE)
   else()
-    get_filename_component(INSTRUMENTATION_SOURCE_DIR_tmp "${CMAKE_SOURCE_DIR}/../instrumentation" ABSOLUTE)
+    get_filename_component(INSTRUMENTATION_SOURCE_DIR_tmp "${NEO_SOURCE_DIR}/../instrumentation" ABSOLUTE)
     if(IS_DIRECTORY "${INSTRUMENTATION_SOURCE_DIR_tmp}")
       set(INSTRUMENTATION_SOURCE_DIR "${INSTRUMENTATION_SOURCE_DIR_tmp}")
     endif()
@@ -463,7 +463,7 @@ if(NOT DISABLE_LIBVA)
       if(DEFINED LIBVA_SOURCE_DIR)
         get_filename_component(LIBVA_SOURCE_DIR "${LIBVA_SOURCE_DIR}" ABSOLUTE)
       else()
-        get_filename_component(LIBVA_SOURCE_DIR_tmp "${CMAKE_SOURCE_DIR}/../libva" ABSOLUTE)
+        get_filename_component(LIBVA_SOURCE_DIR_tmp "${NEO_SOURCE_DIR}/../libva" ABSOLUTE)
         if(IS_DIRECTORY "${LIBVA_SOURCE_DIR_tmp}")
           set(LIBVA_SOURCE_DIR "${LIBVA_SOURCE_DIR_tmp}")
         endif()
@@ -743,22 +743,22 @@ endif()
 
 # Project-wide include paths
 # Please keep alphabetical order
-include_directories(${IGDRCL_SOURCE_DIR})
 include_directories(${IGDRCL_BUILD_DIR})
-include_directories(${IGDRCL_SOURCE_DIR}/core/memory_manager/definitions${BRANCH_DIR_SUFFIX})
-include_directories(${IGDRCL_SOURCE_DIR}/core/memory_properties${BRANCH_DIR_SUFFIX})
-include_directories(${IGDRCL_SOURCE_DIR}/runtime/built_ins/builtinops${BRANCH_DIR_SUFFIX})
-include_directories(${IGDRCL_SOURCE_DIR}/runtime/command_stream/definitions${BRANCH_DIR_SUFFIX})
-include_directories(${IGDRCL_SOURCE_DIR}/runtime/gen_common/reg_configs${BRANCH_DIR_SUFFIX})
-include_directories(${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/${BRANCH_DIR_SUFFIX})
-include_directories(${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/client_context${BRANCH_DIR_SUFFIX})
-include_directories(${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/gmm_memory${BRANCH_DIR_SUFFIX})
-include_directories(${IGDRCL_SOURCE_DIR}/runtime/mem_obj/definitions${BRANCH_DIR_SUFFIX})
-include_directories(${IGDRCL_SOURCE_DIR}/runtime/memory_manager/definitions${BRANCH_DIR_SUFFIX})
-include_directories(${IGDRCL_SOURCE_DIR}/runtime/os_interface/definitions${BRANCH_DIR_SUFFIX})
-include_directories(${IGDRCL_SOURCE_DIR}/runtime/sku_info/definitions${BRANCH_DIR_SUFFIX})
-
-set(HW_SRC_INCLUDE_PATH ${IGDRCL_SOURCE_DIR}/runtime/gen_common)
+include_directories(${NEO_SOURCE_DIR})
+include_directories(${NEO_SOURCE_DIR}/core/memory_manager/definitions${BRANCH_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/core/memory_properties${BRANCH_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/runtime/built_ins/builtinops${BRANCH_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/runtime/command_stream/definitions${BRANCH_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/runtime/gen_common/reg_configs${BRANCH_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/runtime/gmm_helper/${BRANCH_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/runtime/gmm_helper/client_context${BRANCH_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/runtime/gmm_helper/gmm_memory${BRANCH_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/runtime/mem_obj/definitions${BRANCH_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/runtime/memory_manager/definitions${BRANCH_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/runtime/os_interface/definitions${BRANCH_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/runtime/sku_info/definitions${BRANCH_DIR_SUFFIX})
+
+set(HW_SRC_INCLUDE_PATH ${NEO_SOURCE_DIR}/runtime/gen_common)
 
 if(HAVE_INSTRUMENTATION)
   set(IGDRCL__INSTRUMENTATION_DIR_SUFFIX ${BRANCH_DIR_SUFFIX})
@@ -767,7 +767,7 @@ if(HAVE_INSTRUMENTATION)
 else()
   set(IGDRCL__INSTRUMENTATION_DIR_SUFFIX "/")
 endif()
-include_directories(${IGDRCL_SOURCE_DIR}/runtime/instrumentation${IGDRCL__INSTRUMENTATION_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/runtime/instrumentation${IGDRCL__INSTRUMENTATION_DIR_SUFFIX})
 
 # Define where to put binaries
 if(MSVC)
@@ -839,9 +839,9 @@ else()
 endif()
 
 set(DONT_LINK_ELF_STATICALLY TRUE)
-if(EXISTS ${IGDRCL_SOURCE_DIR}/../internal)
-  add_subdirectory_unique(${IGDRCL_SOURCE_DIR}/../internal ${IGDRCL_BUILD_DIR}/internal)
-endif(EXISTS ${IGDRCL_SOURCE_DIR}/../internal)
+if(EXISTS ${NEO_SOURCE_DIR}/../internal)
+  add_subdirectory_unique(${NEO_SOURCE_DIR}/../internal ${IGDRCL_BUILD_DIR}/internal)
+endif(EXISTS ${NEO_SOURCE_DIR}/../internal)
 
 add_subdirectory_unique(scripts/lint)
 

common_macros.cmake

@@ -5,12 +5,12 @@
 #
 
 macro(hide_subdir subdir)
-  file(RELATIVE_PATH subdir_relative ${IGDRCL_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${subdir})
+  file(RELATIVE_PATH subdir_relative ${NEO_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${subdir})
   set(${subdir_relative}_hidden} TRUE)
 endmacro()
 
 macro(add_subdirectory_unique subdir)
-  file(RELATIVE_PATH subdir_relative ${IGDRCL_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${subdir})
+  file(RELATIVE_PATH subdir_relative ${NEO_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${subdir})
   if(NOT ${subdir_relative}_hidden})
     add_subdirectory(${subdir} ${ARGN})
   endif()
@@ -20,7 +20,7 @@ endmacro()
 macro(add_subdirectories)
   file(GLOB subdirectories RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*)
   foreach(subdir ${subdirectories})
-    file(RELATIVE_PATH subdir_relative ${IGDRCL_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${subdir})
+    file(RELATIVE_PATH subdir_relative ${NEO_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${subdir})
     if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/CMakeLists.txt AND NOT ${subdir_relative}_hidden})
       add_subdirectory(${subdir})
     endif()
@@ -29,7 +29,7 @@ endmacro()
 
 macro(create_project_source_tree target)
   if(MSVC)
-    set(prefixes ${CMAKE_CURRENT_SOURCE_DIR} ${ARGN} ${IGDRCL_SOURCE_DIR})
+    set(prefixes ${CMAKE_CURRENT_SOURCE_DIR} ${ARGN} ${NEO_SOURCE_DIR})
     get_target_property(source_list ${target} SOURCES)
     foreach(source_file ${source_list})
       if(NOT ${source_file} MATCHES "\<*\>")

elf/CMakeLists.txt

@@ -16,7 +16,7 @@ add_library(elflib STATIC EXCLUDE_FROM_ALL
 create_project_source_tree(elflib)
 
 target_include_directories(elflib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-target_include_directories(elflib PRIVATE ${IGDRCL_SOURCE_DIR})
+target_include_directories(elflib PRIVATE ${NEO_SOURCE_DIR})
 
 set_target_properties(elflib PROPERTIES FOLDER "elflib")
 

offline_compiler/CMakeLists.txt

@@ -7,50 +7,50 @@
 project(ocloc)
 
 set(CLOC_SRCS_LIB
-  ${IGDRCL_SOURCE_DIR}/core/helpers/abort.cpp
-  ${IGDRCL_SOURCE_DIR}/core/helpers/debug_helpers.cpp
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/decoder/binary_decoder.cpp
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/decoder/binary_decoder.h
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/decoder/binary_encoder.cpp
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/decoder/binary_encoder.h
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/decoder/helper.cpp
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/decoder/helper.h
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/decoder/iga_wrapper.h
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/decoder/translate_platform_base.h
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/helper.cpp
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/offline_compiler.cpp
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/offline_compiler.h
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/multi_command.cpp
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/multi_command.h
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/options.cpp
-  ${IGDRCL_SOURCE_DIR}/offline_compiler/${BRANCH_DIR_SUFFIX}/extra_settings.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/compiler_interface/create_main.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/helpers/file_io.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/helpers/hw_info.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/platform/extensions.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/platform/extensions.h
+  ${NEO_SOURCE_DIR}/core/helpers/abort.cpp
+  ${NEO_SOURCE_DIR}/core/helpers/debug_helpers.cpp
+  ${NEO_SOURCE_DIR}/offline_compiler/decoder/binary_decoder.cpp
+  ${NEO_SOURCE_DIR}/offline_compiler/decoder/binary_decoder.h
+  ${NEO_SOURCE_DIR}/offline_compiler/decoder/binary_encoder.cpp
+  ${NEO_SOURCE_DIR}/offline_compiler/decoder/binary_encoder.h
+  ${NEO_SOURCE_DIR}/offline_compiler/decoder/helper.cpp
+  ${NEO_SOURCE_DIR}/offline_compiler/decoder/helper.h
+  ${NEO_SOURCE_DIR}/offline_compiler/decoder/iga_wrapper.h
+  ${NEO_SOURCE_DIR}/offline_compiler/decoder/translate_platform_base.h
+  ${NEO_SOURCE_DIR}/offline_compiler/helper.cpp
+  ${NEO_SOURCE_DIR}/offline_compiler/offline_compiler.cpp
+  ${NEO_SOURCE_DIR}/offline_compiler/offline_compiler.h
+  ${NEO_SOURCE_DIR}/offline_compiler/multi_command.cpp
+  ${NEO_SOURCE_DIR}/offline_compiler/multi_command.h
+  ${NEO_SOURCE_DIR}/offline_compiler/options.cpp
+  ${NEO_SOURCE_DIR}/offline_compiler/${BRANCH_DIR_SUFFIX}/extra_settings.cpp
+  ${NEO_SOURCE_DIR}/runtime/compiler_interface/create_main.cpp
+  ${NEO_SOURCE_DIR}/runtime/helpers/file_io.cpp
+  ${NEO_SOURCE_DIR}/runtime/helpers/hw_info.cpp
+  ${NEO_SOURCE_DIR}/runtime/platform/extensions.cpp
+  ${NEO_SOURCE_DIR}/runtime/platform/extensions.h
 )
 
 if(${IGA_HEADERS_AVAILABLE})
   set(CLOC_SRCS_LIB ${CLOC_SRCS_LIB}
-    ${IGDRCL_SOURCE_DIR}/offline_compiler/decoder/iga_wrapper.cpp
-    ${IGDRCL_SOURCE_DIR}/offline_compiler/decoder${BRANCH_DIR_SUFFIX}/translate_platform.cpp
+    ${NEO_SOURCE_DIR}/offline_compiler/decoder/iga_wrapper.cpp
+    ${NEO_SOURCE_DIR}/offline_compiler/decoder${BRANCH_DIR_SUFFIX}/translate_platform.cpp
   )
 else()
   set(CLOC_SRCS_LIB ${CLOC_SRCS_LIB}
-    ${IGDRCL_SOURCE_DIR}/offline_compiler/decoder/iga_stubs.cpp
+    ${NEO_SOURCE_DIR}/offline_compiler/decoder/iga_stubs.cpp
   )
 endif()
 
 if(WIN32)
   list(APPEND CLOC_SRCS_LIB
-    ${IGDRCL_SOURCE_DIR}/runtime/os_interface/windows/os_library.cpp
-    ${IGDRCL_SOURCE_DIR}/runtime/dll/windows/options.cpp
+    ${NEO_SOURCE_DIR}/runtime/os_interface/windows/os_library.cpp
+    ${NEO_SOURCE_DIR}/runtime/dll/windows/options.cpp
   )
 else()
   list(APPEND CLOC_SRCS_LIB
-    ${IGDRCL_SOURCE_DIR}/runtime/os_interface/linux/os_library.cpp
-    ${IGDRCL_SOURCE_DIR}/runtime/dll/linux/options.cpp
+    ${NEO_SOURCE_DIR}/runtime/os_interface/linux/os_library.cpp
+    ${NEO_SOURCE_DIR}/runtime/dll/linux/options.cpp
   )
 endif()
 
@@ -63,19 +63,19 @@ set(RUNTIME_GENX_CPP_FILES
 )
 
 macro(macro_for_each_platform)
-  list(APPEND CLOC_SRCS_LIB ${IGDRCL_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/hw_info_${PLATFORM_IT_LOWER}.inl)
+  list(APPEND CLOC_SRCS_LIB ${NEO_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/hw_info_${PLATFORM_IT_LOWER}.inl)
 endmacro()
 
 macro(macro_for_each_gen)
   foreach(SRC_IT ${RUNTIME_GENX_CPP_FILES})
-    set(SRC_FILE ${IGDRCL_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/${SRC_IT})
+    set(SRC_FILE ${NEO_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/${SRC_IT})
     if(EXISTS ${SRC_FILE}_${GEN_TYPE_LOWER}.cpp)
       list(APPEND CLOC_SRCS_LIB ${SRC_FILE}_${GEN_TYPE_LOWER}.cpp)
     endif()
   endforeach()
   apply_macro_for_each_platform()
 
-  list(APPEND CLOC_SRCS_LIB ${IGDRCL_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/enable_${GEN_TYPE_LOWER}.cpp)
+  list(APPEND CLOC_SRCS_LIB ${NEO_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/enable_${GEN_TYPE_LOWER}.cpp)
 endmacro()
 
 apply_macro_for_each_gen("SUPPORTED")

runtime/CMakeLists.txt

@@ -121,7 +121,7 @@ if(${GENERATE_EXECUTABLE})
 
   add_library(${NEO_DYNAMIC_LIB_NAME} SHARED
     ${NEO_DYNAMIC_LIB__TARGET_OBJECTS}
-    ${IGDRCL_SOURCE_DIR}/runtime/aub/aub_stream_interface.cpp
+    ${NEO_SOURCE_DIR}/runtime/aub/aub_stream_interface.cpp
   )
 
   if(UNIX)
@@ -189,7 +189,7 @@ if(UNIX AND NOT (TARGET clang-tidy))
     POST_BUILD
     COMMAND echo clang-tidy...
     COMMAND find ${CMAKE_CURRENT_SOURCE_DIR} -name *.cpp -print0 | xargs -0 -I{} -P`nproc` clang-tidy -p ${IGDRCL_BINARY_DIR} {} | tee ${IGDRCL_BINARY_DIR}/clang-tidy.log
-    WORKING_DIRECTORY ${IGDRCL_SOURCE_DIR}
+    WORKING_DIRECTORY ${NEO_SOURCE_DIR}
   )
 endif()
 

runtime/dll/CMakeLists.txt

@@ -5,7 +5,7 @@
 #
 
 if(NOT DISABLED_GTPIN_SUPPORT)
-  set(GTPIN_INIT_FILE "${IGDRCL_SOURCE_DIR}/runtime/gtpin/gtpin_init.cpp")
+  set(GTPIN_INIT_FILE "${NEO_SOURCE_DIR}/runtime/gtpin/gtpin_init.cpp")
 else()
   set(GTPIN_INIT_FILE "")
 endif()
@@ -19,14 +19,14 @@ set(RUNTIME_SRCS_DLL_BASE
   ${CMAKE_CURRENT_SOURCE_DIR}/source_level_debugger.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/get_devices.cpp
 
-  ${IGDRCL_SOURCE_DIR}/core/helpers/abort.cpp
-  ${IGDRCL_SOURCE_DIR}/core/helpers/debug_helpers.cpp
-  ${IGDRCL_SOURCE_DIR}/core/utilities/clflush.cpp
-  ${IGDRCL_SOURCE_DIR}/core/utilities/debug_settings_reader_creator.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/api/api.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/resource_info.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/helpers/built_ins_helper.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/program/evaluate_unhandled_token.cpp
+  ${NEO_SOURCE_DIR}/core/helpers/abort.cpp
+  ${NEO_SOURCE_DIR}/core/helpers/debug_helpers.cpp
+  ${NEO_SOURCE_DIR}/core/utilities/clflush.cpp
+  ${NEO_SOURCE_DIR}/core/utilities/debug_settings_reader_creator.cpp
+  ${NEO_SOURCE_DIR}/runtime/api/api.cpp
+  ${NEO_SOURCE_DIR}/runtime/gmm_helper/resource_info.cpp
+  ${NEO_SOURCE_DIR}/runtime/helpers/built_ins_helper.cpp
+  ${NEO_SOURCE_DIR}/runtime/program/evaluate_unhandled_token.cpp
 
   ${GTPIN_INIT_FILE}
   ${HW_SRC_LINK}
@@ -48,11 +48,11 @@ set(RUNTIME_SRCS_DLL_WINDOWS
   ${CMAKE_CURRENT_SOURCE_DIR}/windows/environment_variables.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/windows/options.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/windows/os_interface.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/gmm_memory.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/page_table_mngr.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/os_interface/windows/sys_calls.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/os_interface/windows/wddm/wddm_calls.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/os_interface/windows/wddm/wddm_create.cpp
+  ${NEO_SOURCE_DIR}/runtime/gmm_helper/gmm_memory.cpp
+  ${NEO_SOURCE_DIR}/runtime/gmm_helper/page_table_mngr.cpp
+  ${NEO_SOURCE_DIR}/runtime/os_interface/windows/sys_calls.cpp
+  ${NEO_SOURCE_DIR}/runtime/os_interface/windows/wddm/wddm_calls.cpp
+  ${NEO_SOURCE_DIR}/runtime/os_interface/windows/wddm/wddm_create.cpp
 )
 
 target_sources(${NEO_DYNAMIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_DLL_BASE})

runtime/enable_gens.cmake

@@ -56,7 +56,7 @@ endmacro()
 
 macro(macro_for_each_gen)
   set(GENX_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/${GEN_TYPE_LOWER})
-  set(CORE_GENX_PREFIX "${IGDRCL_SOURCE_DIR}/core/${GEN_TYPE_LOWER}")
+  set(CORE_GENX_PREFIX "${NEO_SOURCE_DIR}/core/${GEN_TYPE_LOWER}")
   # Add default GEN files
   foreach(SRC_IT ${RUNTIME_SRCS_GENX_H_BASE})
     list(APPEND RUNTIME_SRCS_${GEN_TYPE}_H_BASE ${GENX_PREFIX}/${SRC_IT})

runtime/gen12lp/additional_files_gen12lp.cmake

@@ -11,7 +11,7 @@ set(RUNTIME_SRCS_ADDITIONAL_FILES_GEN12LP
   ${CMAKE_CURRENT_SOURCE_DIR}/gen12lp${BRANCH_DIR_SUFFIX}/helpers_gen12lp.cpp
 )
 
-include_directories(${IGDRCL_SOURCE_DIR}/runtime/gen12lp/definitions${BRANCH_DIR_SUFFIX}/)
+include_directories(${NEO_SOURCE_DIR}/runtime/gen12lp/definitions${BRANCH_DIR_SUFFIX}/)
 
 target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_ADDITIONAL_FILES_GEN12LP})
 set_property(GLOBAL PROPERTY RUNTIME_SRCS_ADDITIONAL_FILES_GEN12LP ${RUNTIME_SRCS_ADDITIONAL_FILES_GEN12LP})

runtime/sharings/CMakeLists.txt

@@ -30,12 +30,12 @@ set_property(GLOBAL PROPERTY RUNTIME_SRCS_SHARINGS ${RUNTIME_SRCS_SHARINGS})
 
 
 if(WIN32)
-  target_include_directories(${SHARINGS_ENABLE_LIB_NAME} PRIVATE ${IGDRCL_SOURCE_DIR}/runtime/os_interface/windows)
+  target_include_directories(${SHARINGS_ENABLE_LIB_NAME} PRIVATE ${NEO_SOURCE_DIR}/runtime/os_interface/windows)
 else()
-  target_include_directories(${SHARINGS_ENABLE_LIB_NAME} PRIVATE ${IGDRCL_SOURCE_DIR}/runtime/os_interface/linux)
+  target_include_directories(${SHARINGS_ENABLE_LIB_NAME} PRIVATE ${NEO_SOURCE_DIR}/runtime/os_interface/linux)
 endif()
 
 add_subdirectories()
 
-create_project_source_tree(${SHARINGS_ENABLE_LIB_NAME} ${IGDRCL_SOURCE_DIR}/runtime)
+create_project_source_tree(${SHARINGS_ENABLE_LIB_NAME} ${NEO_SOURCE_DIR}/runtime)
 set(MSVC_DEF_ADDITIONAL_EXPORTS ${MSVC_DEF_ADDITIONAL_EXPORTS} PARENT_SCOPE)

scripts/lint/CMakeLists.txt

@@ -1,21 +1,21 @@
 #
-# Copyright (C) 2018 Intel Corporation
+# Copyright (C) 2018-2019 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
-if(IS_DIRECTORY ${IGDRCL_SOURCE_DIR}/.git)
+if(IS_DIRECTORY ${NEO_SOURCE_DIR}/.git)
   add_custom_target(lint
-    ${IGDRCL_SOURCE_DIR}/scripts/lint${BRANCH_DIR_SUFFIX}/set_copyright.sh
-    WORKING_DIRECTORY ${IGDRCL_SOURCE_DIR}
+    ${NEO_SOURCE_DIR}/scripts/lint${BRANCH_DIR_SUFFIX}/set_copyright.sh
+    WORKING_DIRECTORY ${NEO_SOURCE_DIR}
   )
   set_target_properties(lint PROPERTIES
     EXCLUDE_FROM_DEFAULT_BUILD TRUE
     EXCLUDE_FROM_ALL TRUE
   )
   add_custom_target(lint_head
-    ${IGDRCL_SOURCE_DIR}/scripts/lint${BRANCH_DIR_SUFFIX}/set_copyright.sh HEAD
-    WORKING_DIRECTORY ${IGDRCL_SOURCE_DIR}
+    ${NEO_SOURCE_DIR}/scripts/lint${BRANCH_DIR_SUFFIX}/set_copyright.sh HEAD
+    WORKING_DIRECTORY ${NEO_SOURCE_DIR}
   )
   set_target_properties(lint_head PROPERTIES
     EXCLUDE_FROM_DEFAULT_BUILD TRUE