diff --git a/opencl/source/CMakeLists.txt b/opencl/source/CMakeLists.txt index f3f16703f7..f6ba9d2423 100644 --- a/opencl/source/CMakeLists.txt +++ b/opencl/source/CMakeLists.txt @@ -15,7 +15,7 @@ endif() project(neo) set(MSVC_DEF_ADDITIONAL_EXPORTS "") set(OPENCL_RUNTIME_PROJECTS_FOLDER "opencl runtime") -set(OPENCL_BUIILINS_PROJECTS_FOLDER "built_ins") +set(OPENCL_BUILTINS_PROJECTS_FOLDER "built_ins") if(NOT TARGET ${BIKSIM_LIB_NAME}) add_subdirectory(builtin_kernels_simulation) diff --git a/opencl/source/built_ins/kernels/CMakeLists.txt b/opencl/source/built_ins/kernels/CMakeLists.txt index 660be4988f..2ae85a3ff6 100644 --- a/opencl/source/built_ins/kernels/CMakeLists.txt +++ b/opencl/source/built_ins/kernels/CMakeLists.txt @@ -6,7 +6,7 @@ if(NOT NEO_DISABLE_BUILTINS_COMPILATION) add_custom_target(builtins_vme_sources) - set_target_properties(builtins_vme_sources PROPERTIES FOLDER "${OPENCL_RUNTIME_PROJECTS_FOLDER}/${OPENCL_BUIILINS_PROJECTS_FOLDER}") + set_target_properties(builtins_vme_sources PROPERTIES FOLDER "${OPENCL_RUNTIME_PROJECTS_FOLDER}/${OPENCL_BUILTINS_PROJECTS_FOLDER}") set(BUILTINS_OUTDIR_WITH_ARCH "${TargetDir}/built_ins/${NEO_ARCH}") add_dependencies(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} builtins_vme_sources) add_subdirectories() diff --git a/opencl/source/built_ins/registry/CMakeLists.txt b/opencl/source/built_ins/registry/CMakeLists.txt index a0f323a99e..980176e138 100644 --- a/opencl/source/built_ins/registry/CMakeLists.txt +++ b/opencl/source/built_ins/registry/CMakeLists.txt @@ -9,7 +9,7 @@ add_library(${BUILTINS_VME_LIB_NAME} OBJECT EXCLUDE_FROM_ALL register_ext_vme_source.cpp ) set_target_properties(${BUILTINS_VME_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON) -set_target_properties(${BUILTINS_VME_LIB_NAME} PROPERTIES FOLDER "${OPENCL_RUNTIME_PROJECTS_FOLDER}/${OPENCL_BUIILINS_PROJECTS_FOLDER}") +set_target_properties(${BUILTINS_VME_LIB_NAME} PROPERTIES FOLDER "${OPENCL_RUNTIME_PROJECTS_FOLDER}/${OPENCL_BUILTINS_PROJECTS_FOLDER}") target_include_directories(${BUILTINS_VME_LIB_NAME} PRIVATE ${KHRONOS_HEADERS_DIR} diff --git a/opencl/source/builtin_kernels_simulation/CMakeLists.txt b/opencl/source/builtin_kernels_simulation/CMakeLists.txt index 30bc55536d..fad1cce27b 100644 --- a/opencl/source/builtin_kernels_simulation/CMakeLists.txt +++ b/opencl/source/builtin_kernels_simulation/CMakeLists.txt @@ -57,5 +57,5 @@ target_include_directories(${BIKSIM_LIB_NAME} BEFORE PRIVATE ${NEO__IGC_INCLUDE_DIR} ${THIRD_PARTY_DIR} ) -set_target_properties(${BIKSIM_LIB_NAME} PROPERTIES FOLDER "${OPENCL_RUNTIME_PROJECTS_FOLDER}/${OPENCL_BUIILINS_PROJECTS_FOLDER}") +set_target_properties(${BIKSIM_LIB_NAME} PROPERTIES FOLDER "${OPENCL_RUNTIME_PROJECTS_FOLDER}/${OPENCL_BUILTINS_PROJECTS_FOLDER}") target_compile_definitions(${BIKSIM_LIB_NAME} PUBLIC ${SUPPORTED_GEN_FLAGS_DEFINITONS} ${DEFAULT_GEN_PLATFORMS_DEFITIONS} MOCKABLE_VIRTUAL=) diff --git a/shared/source/built_ins/CMakeLists.txt b/shared/source/built_ins/CMakeLists.txt index e336f29e90..b451b49f73 100644 --- a/shared/source/built_ins/CMakeLists.txt +++ b/shared/source/built_ins/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT # -set(SHARED_BUIILINS_PROJECTS_FOLDER "built_ins") +set(SHARED_BUILTINS_PROJECTS_FOLDER "built_ins") set(NEO_CORE_SRCS_BUILT_INS ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/built_ins_storage.cpp diff --git a/shared/source/built_ins/builtins_binary.cmake b/shared/source/built_ins/builtins_binary.cmake index 3f509eb5eb..18b14af371 100644 --- a/shared/source/built_ins/builtins_binary.cmake +++ b/shared/source/built_ins/builtins_binary.cmake @@ -65,7 +65,7 @@ endif() set_target_properties(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} PROPERTIES LINKER_LANGUAGE CXX) set_target_properties(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON) -set_target_properties(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUIILINS_PROJECTS_FOLDER}") +set_target_properties(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUILTINS_PROJECTS_FOLDER}") target_include_directories(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} PRIVATE ${ENGINE_NODE_DIR} @@ -83,7 +83,7 @@ endif() set_target_properties(${BUILTINS_BINARIES_BINDLESS_LIB_NAME} PROPERTIES LINKER_LANGUAGE CXX) set_target_properties(${BUILTINS_BINARIES_BINDLESS_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON) -set_target_properties(${BUILTINS_BINARIES_BINDLESS_LIB_NAME} PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUIILINS_PROJECTS_FOLDER}") +set_target_properties(${BUILTINS_BINARIES_BINDLESS_LIB_NAME} PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUILTINS_PROJECTS_FOLDER}") target_include_directories(${BUILTINS_BINARIES_BINDLESS_LIB_NAME} PRIVATE ${ENGINE_NODE_DIR} diff --git a/shared/source/built_ins/kernels/CMakeLists.txt b/shared/source/built_ins/kernels/CMakeLists.txt index b24b4a552c..d7f923187c 100644 --- a/shared/source/built_ins/kernels/CMakeLists.txt +++ b/shared/source/built_ins/kernels/CMakeLists.txt @@ -6,7 +6,7 @@ if(NOT NEO_DISABLE_BUILTINS_COMPILATION) add_custom_target(builtins) - set_target_properties(builtins PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUIILINS_PROJECTS_FOLDER}") + set_target_properties(builtins PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUILTINS_PROJECTS_FOLDER}") set(BUILTINS_OUTDIR_WITH_ARCH "${TargetDir}/built_ins/${NEO_ARCH}") add_dependencies(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} builtins) add_dependencies(${BUILTINS_BINARIES_BINDLESS_LIB_NAME} builtins) @@ -164,7 +164,7 @@ if(NOT NEO_DISABLE_BUILTINS_COMPILATION) set(target_name builtins_${family_name_with_type}) add_custom_target(${target_name}) add_dependencies(builtins ${target_name}) - set_target_properties(${target_name} PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUIILINS_PROJECTS_FOLDER}/${family_name_with_type}") + set_target_properties(${target_name} PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUILTINS_PROJECTS_FOLDER}/${family_name_with_type}") foreach(MODE ${BIND_MODES}) unset(BUILTINS_COMMANDS) foreach(GENERATED_BUILTIN ${GENERATED_BUILTINS}) @@ -193,7 +193,7 @@ if(NOT NEO_DISABLE_BUILTINS_COMPILATION) set_property(GLOBAL PROPERTY GENERATED_BUILTINS_CPPS_${MODE} ${GENERATED_BUILTINS_CPPS_${MODE}}) add_custom_target(${target_name}_${MODE} DEPENDS ${BUILTINS_COMMANDS}) add_dependencies(${target_name} ${target_name}_${MODE}) - set_target_properties(${target_name}_${MODE} PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUIILINS_PROJECTS_FOLDER}/${family_name_with_type}") + set_target_properties(${target_name}_${MODE} PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUILTINS_PROJECTS_FOLDER}/${family_name_with_type}") endforeach() endif() endforeach() @@ -218,7 +218,7 @@ if(NOT NEO_DISABLE_BUILTINS_COMPILATION) add_library(${BUILTINS_SPIRV_LIB_NAME} OBJECT ${OUTPUT_LIST_CPP_FILES}) set_target_properties(${BUILTINS_SPIRV_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON - FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUIILINS_PROJECTS_FOLDER}" + FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUILTINS_PROJECTS_FOLDER}" ) apply_macro_for_each_gen("SUPPORTED") diff --git a/shared/source/built_ins/registry/CMakeLists.txt b/shared/source/built_ins/registry/CMakeLists.txt index f0a82ae541..1e5f714984 100644 --- a/shared/source/built_ins/registry/CMakeLists.txt +++ b/shared/source/built_ins/registry/CMakeLists.txt @@ -11,7 +11,7 @@ add_library(${BUILTINS_SOURCES_LIB_NAME} OBJECT EXCLUDE_FROM_ALL ) set_target_properties(${BUILTINS_SOURCES_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON) -set_target_properties(${BUILTINS_SOURCES_LIB_NAME} PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUIILINS_PROJECTS_FOLDER}") +set_target_properties(${BUILTINS_SOURCES_LIB_NAME} PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUILTINS_PROJECTS_FOLDER}") target_include_directories(${BUILTINS_SOURCES_LIB_NAME} PRIVATE ${ENGINE_NODE_DIR}