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>
This commit is contained in:
Mateusz Jablonski
2020-11-23 15:00:38 +01:00
committed by Compute-Runtime-Automation
parent 8aacad1854
commit 720326fd6a
6 changed files with 15 additions and 2 deletions

View File

@@ -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)

View File

@@ -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"
)

View File

@@ -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}
)

View File

@@ -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()

View File

@@ -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}")

View File

@@ -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")