Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup in cmake files 

don't use runtime folder in opencl
correct folders in VS solution

Change-Id: I1da0bfdf417b4603835093831d4e5f671181b2cf
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski 2020-03-27 09:21:41 +01:00 committed by sys_ocldev
parent c96de8ff11
commit d64c46a932
10 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
opencl/source/CMakeLists.txt
View File

@ -14,6 +14,7 @@ endif()
project(neo)
set(MSVC_DEF_ADDITIONAL_EXPORTS "")
set(OPENCL_RUNTIME_PROJECTS_FOLDER "opencl runtime")
if(NOT TARGET ${BIKSIM_LIB_NAME})
add_subdirectory(builtin_kernels_simulation)
@ -100,7 +101,7 @@ set_target_properties(${NEO_STATIC_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_COD
set_property(TARGET ${NEO_STATIC_LIB_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS})
set_target_properties(${NEO_STATIC_LIB_NAME} PROPERTIES FOLDER "opencl runtime")
set_target_properties(${NEO_STATIC_LIB_NAME} PROPERTIES FOLDER ${OPENCL_RUNTIME_PROJECTS_FOLDER})
set(EXPORTS_FILENAME "")
if(WIN32)
@ -182,7 +183,7 @@ if(${GENERATE_EXECUTABLE})
RELEASEINTERNAL_OUTPUT_NAME "${NEO_DLL_NAME_BASE}${IGDRCL_NAME_POSTFIX}${IGDRCL_OPTION__BITS}"
OUTPUT_NAME "${NEO_DLL_NAME_BASE}${IGDRCL_NAME_POSTFIX}${IGDRCL_OPTION__BITS}"
)
set_target_properties(${NEO_DYNAMIC_LIB_NAME} PROPERTIES FOLDER "opencl runtime")
set_target_properties(${NEO_DYNAMIC_LIB_NAME} PROPERTIES FOLDER ${OPENCL_RUNTIME_PROJECTS_FOLDER})
create_project_source_tree_with_exports(${NEO_DYNAMIC_LIB_NAME} "${EXPORTS_FILENAME}")
endif(${GENERATE_EXECUTABLE})

2
opencl/source/built_ins/kernels/CMakeLists.txt
View File

@ -101,7 +101,7 @@ macro(macro_for_each_gen)
set(target_name builtins_${family_name_with_type}_vme)
add_custom_target(${target_name} DEPENDS ${BUILTINS_COMMANDS})
add_dependencies(builtins ${target_name})
set_target_properties(${target_name} PROPERTIES FOLDER "opencl/source/built_ins/${family_name_with_type}")
set_target_properties(${target_name} PROPERTIES FOLDER "${OPENCL_RUNTIME_PROJECTS_FOLDER}/built_ins/${family_name_with_type}")
endif()
endforeach()
endmacro()

2
opencl/source/scheduler/scheduler_binary.cmake
View File

@ -55,7 +55,7 @@ function(compile_kernel target gen_type platform_type kernel)
set(SCHEDULER_CPP ${SCHEDULER_CPP} PARENT_SCOPE)
add_custom_target(${target} DEPENDS ${OUTPUTPATH})
set_target_properties(${target} PROPERTIES FOLDER "opencl/source/scheduler/${gen_type_lower}")
set_target_properties(${target} PROPERTIES FOLDER "${OPENCL_RUNTIME_PROJECTS_FOLDER}/scheduler/${gen_type_lower}")
endfunction()
macro(macro_for_each_gen)

4
opencl/source/sharings/CMakeLists.txt
View File

@ -7,7 +7,7 @@
file(GLOB_RECURSE SHARING_ENABLE_CPPS enable*.cpp)
add_library (${SHARINGS_ENABLE_LIB_NAME} OBJECT EXCLUDE_FROM_ALL ${SHARING_ENABLE_CPPS})
set_target_properties (${SHARINGS_ENABLE_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties (${SHARINGS_ENABLE_LIB_NAME} PROPERTIES FOLDER "opencl runtime")
set_target_properties (${SHARINGS_ENABLE_LIB_NAME} PROPERTIES FOLDER ${OPENCL_RUNTIME_PROJECTS_FOLDER})
target_include_directories(${SHARINGS_ENABLE_LIB_NAME} PRIVATE
${KHRONOS_HEADERS_DIR}
@ -36,5 +36,5 @@ endif()
add_subdirectories()
create_project_source_tree(${SHARINGS_ENABLE_LIB_NAME} ${NEO_SOURCE_DIR}/runtime)
create_project_source_tree(${SHARINGS_ENABLE_LIB_NAME})
set(MSVC_DEF_ADDITIONAL_EXPORTS ${MSVC_DEF_ADDITIONAL_EXPORTS} PARENT_SCOPE)

2
opencl/test/unit_test/CMakeLists.txt
View File

@ -463,7 +463,7 @@ macro(macro_for_each_gen)
endmacro()
apply_macro_for_each_gen("TESTED")
add_subdirectories()
create_project_source_tree(igdrcl_tests ${NEO_SOURCE_DIR}/runtime)
create_project_source_tree(igdrcl_tests)
set(UltPchHeader "${CMAKE_CURRENT_SOURCE_DIR}/igdrcl_tests_pch.h")
set(UltPchSource "${CMAKE_CURRENT_SOURCE_DIR}/igdrcl_tests_pch.cpp")

2
opencl/test/unit_test/mt_tests/CMakeLists.txt
View File

@ -58,7 +58,7 @@ endif()
add_dependencies(igdrcl_mt_tests test_dynamic_lib)
create_project_source_tree(igdrcl_mt_tests ${NEO_SOURCE_DIR}/runtime ${NEO_SOURCE_DIR}/unit_tests)
create_project_source_tree(igdrcl_mt_tests)
set_target_properties(igdrcl_mt_tests PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER})
set_property(TARGET igdrcl_mt_tests APPEND_STRING PROPERTY COMPILE_FLAGS ${TSAN_FLAGS})

2
opencl/test/unit_test/offline_compiler/segfault_test/CMakeLists.txt
View File

@ -54,7 +54,7 @@ get_property(CLOC_FOLDER TARGET ocloc PROPERTY FOLDER)
set_property(TARGET ocloc_segfault_test PROPERTY FOLDER ${CLOC_FOLDER})
target_include_directories(ocloc_segfault_test BEFORE PRIVATE ${CLOC_SEGFAULT_TEST_INCLUDES})
create_project_source_tree(ocloc_segfault_test ${NEO_SOURCE_DIR}/offline_compiler ${NEO_SOURCE_DIR}/runtime ${NEO_SOURCE_DIR}/unit_tests)
create_project_source_tree(ocloc_segfault_test)
add_custom_target(run_ocloc_segfault_test ALL
DEPENDS ocloc_segfault_test

2
opencl/test/unit_test/windows/CMakeLists.txt
View File

@ -35,7 +35,7 @@ target_include_directories(igdrcl_windows_dll_tests PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}
)
create_project_source_tree(igdrcl_windows_dll_tests ${NEO_SOURCE_DIR}/runtime ${NEO_SOURCE_DIR}/unit_tests)
create_project_source_tree(igdrcl_windows_dll_tests)
add_custom_target(run_windows_dll_tests ALL DEPENDS unit_tests igdrcl_windows_dll_tests)
add_custom_command(

2
shared/offline_compiler/source/CMakeLists.txt
View File

@ -200,7 +200,7 @@ set_target_properties(ocloc_lib PROPERTIES FOLDER "offline_compiler")
add_custom_target(copy_compiler_files DEPENDS ${NEO__IGC_TARGETS})
set_target_properties(copy_compiler_files PROPERTIES FOLDER "opencl runtime")
set_target_properties(copy_compiler_files PROPERTIES FOLDER "offline_compiler")
if(WIN32)
foreach(TARGET_tmp ${NEO__IGC_TARGETS})

2
shared/source/built_ins/kernels/CMakeLists.txt
View File

@ -101,7 +101,7 @@ macro(macro_for_each_gen)
set(target_name builtins_${family_name_with_type})
add_custom_target(${target_name} DEPENDS ${BUILTINS_COMMANDS})
add_dependencies(builtins ${target_name})
set_target_properties(${target_name} PROPERTIES FOLDER "opencl/source/built_ins/${family_name_with_type}")
set_target_properties(${target_name} PROPERTIES FOLDER "built_ins/${family_name_with_type}")
endif()
endforeach()
endmacro()