From 720326fd6a25b0d3ce2949854e937dde34b39b26 Mon Sep 17 00:00:00 2001
From: Mateusz Jablonski <mateusz.jablonski@intel.com>
Date: Mon, 23 Nov 2020 15:00:38 +0100
Subject: [PATCH] Reorganize VS solution tree

Move scripts targets to neo scripts folder
Move spirv targets to shared builtins folder
Move compute_runtime_mockable_extra to ze_intel_gpu folder

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
---
 CMakeLists.txt                                 | 1 +
 level_zero/cmake/l0_tests.cmake                | 5 ++++-
 scripts/format/CMakeLists.txt                  | 1 +
 scripts/lint/CMakeLists.txt                    | 2 ++
 shared/generate_cpp_array/CMakeLists.txt       | 2 ++
 shared/source/built_ins/kernels/CMakeLists.txt | 6 +++++-
 6 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2a95d98c2..c953333f96 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -980,6 +980,7 @@ if(EXISTS ${NEO_SOURCE_DIR}/../internal)
   add_subdirectory_unique(${NEO_SOURCE_DIR}/../internal ${NEO_BUILD_DIR}/internal)
 endif()
 
+set(NEO_SCRIPT_PROJECTS_FOLDER "neo scripts")
 add_subdirectory_unique(scripts/lint)
 if(EXISTS ${NEO_SOURCE_DIR}/scripts/format)
   add_subdirectory_unique(scripts/format)
diff --git a/level_zero/cmake/l0_tests.cmake b/level_zero/cmake/l0_tests.cmake
index bfbb601d08..bf73af23e1 100644
--- a/level_zero/cmake/l0_tests.cmake
+++ b/level_zero/cmake/l0_tests.cmake
@@ -136,4 +136,7 @@ if(UNIX)
                         dl
   )
 endif()
-set_target_properties(compute_runtime_mockable_extra PROPERTIES POSITION_INDEPENDENT_CODE ON)
+set_target_properties(compute_runtime_mockable_extra PROPERTIES
+                      POSITION_INDEPENDENT_CODE ON
+                      FOLDER "ze_intel_gpu"
+)
diff --git a/scripts/format/CMakeLists.txt b/scripts/format/CMakeLists.txt
index 0a1674ef77..b4c292a980 100644
--- a/scripts/format/CMakeLists.txt
+++ b/scripts/format/CMakeLists.txt
@@ -19,4 +19,5 @@ add_custom_target(format_files
 set_target_properties(format_files PROPERTIES
                       EXCLUDE_FROM_DEFAULT_BUILD TRUE
                       EXCLUDE_FROM_ALL TRUE
+                      FOLDER ${NEO_SCRIPT_PROJECTS_FOLDER}
 )
diff --git a/scripts/lint/CMakeLists.txt b/scripts/lint/CMakeLists.txt
index 7e5d388910..42bf2c3d04 100644
--- a/scripts/lint/CMakeLists.txt
+++ b/scripts/lint/CMakeLists.txt
@@ -12,6 +12,7 @@ if(IS_DIRECTORY ${NEO_SOURCE_DIR}/.git)
   set_target_properties(lint PROPERTIES
                         EXCLUDE_FROM_DEFAULT_BUILD TRUE
                         EXCLUDE_FROM_ALL TRUE
+                        FOLDER ${NEO_SCRIPT_PROJECTS_FOLDER}
   )
   add_custom_target(lint_head
                     ${NEO_SOURCE_DIR}/scripts/lint${BRANCH_DIR_SUFFIX}/set_copyright.sh HEAD
@@ -20,6 +21,7 @@ if(IS_DIRECTORY ${NEO_SOURCE_DIR}/.git)
   set_target_properties(lint_head PROPERTIES
                         EXCLUDE_FROM_DEFAULT_BUILD TRUE
                         EXCLUDE_FROM_ALL TRUE
+                        FOLDER ${NEO_SCRIPT_PROJECTS_FOLDER}
   )
 endif()
 
diff --git a/shared/generate_cpp_array/CMakeLists.txt b/shared/generate_cpp_array/CMakeLists.txt
index a0fec3885c..54df2713f2 100644
--- a/shared/generate_cpp_array/CMakeLists.txt
+++ b/shared/generate_cpp_array/CMakeLists.txt
@@ -4,8 +4,10 @@
 # SPDX-License-Identifier: MIT
 #
 
+set(SHARED_PROJECTS_FOLDER "neo shared")
 set(CPP_GENERATE_TOOL_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
     ${CMAKE_CURRENT_SOURCE_DIR}/source/generate_cpp_array.cpp
 )
 add_executable(cpp_generate_tool "${CPP_GENERATE_TOOL_SOURCES}")
+set_target_properties(cpp_generate_tool PROPERTIES FOLDER "${SHARED_PROJECTS_FOLDER}")
diff --git a/shared/source/built_ins/kernels/CMakeLists.txt b/shared/source/built_ins/kernels/CMakeLists.txt
index 2a34813b7e..34368e78f4 100644
--- a/shared/source/built_ins/kernels/CMakeLists.txt
+++ b/shared/source/built_ins/kernels/CMakeLists.txt
@@ -202,6 +202,10 @@ foreach(builtin_images_stateless ${GENERATED_BUILTINS_IMAGES_STATELESS})
 endforeach()
 add_custom_target(spirv_builtins ALL DEPENDS ${OUTPUT_LIST_SPV_FILES} ${OUTPUT_LIST_CPP_FILES})
 add_library(${BUILTINS_SPIRV_LIB_NAME} OBJECT ${OUTPUT_LIST_CPP_FILES})
-set_target_properties(${BUILTINS_SPIRV_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+set_target_properties(spirv_builtins PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUIILINS_PROJECTS_FOLDER}")
+set_target_properties(${BUILTINS_SPIRV_LIB_NAME} PROPERTIES
+                      POSITION_INDEPENDENT_CODE ON
+                      FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUIILINS_PROJECTS_FOLDER}"
+)
 
 apply_macro_for_each_gen("SUPPORTED")