Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/common_macros.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ function(create_verify_headers_target folder)
set(LIB_NAME verify_${folder})
add_library(${LIB_NAME} INTERFACE)

target_compile_definitions(${LIB_NAME} INTERFACE MOCKABLE_VIRTUAL=virtual ${TESTED_CORE_FLAGS_DEFINITONS})
target_compile_definitions(${LIB_NAME} INTERFACE MOCKABLE_VIRTUAL=virtual ${TESTED_CORE_FLAGS_DEFINITIONS})
set(NEO_SUPPORTED_PRODUCT_FAMILIES ${ALL_TESTED_PRODUCT_FAMILY})
string(REPLACE ";" "," NEO_SUPPORTED_PRODUCT_FAMILIES "${NEO_SUPPORTED_PRODUCT_FAMILIES}")
target_compile_definitions(${LIB_NAME} INTERFACE SUPPORTED_TEST_PRODUCT_FAMILIES=${NEO_SUPPORTED_PRODUCT_FAMILIES} IGA_LIBRARY_NAME="")
Expand Down
2 changes: 1 addition & 1 deletion opencl/source/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ endif()

target_compile_definitions(${NEO_STATIC_LIB_NAME} PUBLIC GMM_LIB_DLL DEFAULT_PLATFORM=${DEFAULT_SUPPORTED_PLATFORM})

list(APPEND LIB_FLAGS_DEFINITIONS -DCIF_HEADERS_ONLY_BUILD ${SUPPORTED_CORE_FLAGS_DEFINITONS})
list(APPEND LIB_FLAGS_DEFINITIONS -DCIF_HEADERS_ONLY_BUILD ${SUPPORTED_CORE_FLAGS_DEFINITIONS})

target_compile_definitions(${NEO_STATIC_LIB_NAME} PUBLIC ${LIB_FLAGS_DEFINITIONS})

Expand Down
2 changes: 1 addition & 1 deletion opencl/test/unit_test/offline_compiler/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ string(TOLOWER ${DEFAULT_TESTED_PLATFORM} CLOC_LIB_DEFAULT_DEVICE)
target_compile_definitions(ocloc_tests PUBLIC
MOCKABLE_VIRTUAL=virtual
$<TARGET_PROPERTY:ocloc_lib,INTERFACE_COMPILE_DEFINITIONS>
${TESTED_CORE_FLAGS_DEFINITONS}
${TESTED_CORE_FLAGS_DEFINITIONS}
NEO_OCLOC_CURRENT_LIB_NAME="ocloc-current"
NEO_OCLOC_FORMER_LIB_NAME="ocloc-former"
DEFAULT_TEST_PLATFORM_NAME="${CLOC_LIB_DEFAULT_DEVICE}"
Expand Down
4 changes: 2 additions & 2 deletions platforms.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ macro(GET_AVAILABLE_PLATFORMS TYPE FLAG_NAME OUT_STR)
CORE_CONTAINS_ANY_PLATFORM("${TYPE}" ${CORE_TYPE} COREX_HAS_PLATFORMS)
if(${COREX_HAS_PLATFORMS})
FIND_IDX_FOR_CORE_TYPE(${CORE_TYPE} CORE_IDX)
list(APPEND ${TYPE}_CORE_FLAGS_DEFINITONS ${FLAG_NAME}_${CORE_TYPE})
list(APPEND ${TYPE}_CORE_FLAGS_DEFINITIONS ${FLAG_NAME}_${CORE_TYPE})
GET_LIST_FOR_CORE_TYPE("PLATFORMS" ${TYPE} ${CORE_IDX} ${TYPE}_COREX_PLATFORMS)
list(APPEND ${TYPE}_PLATFORM_LIST ${${TYPE}_COREX_PLATFORMS})
if(NOT DEFAULT_${TYPE}_PLATFORM)
Expand All @@ -117,7 +117,7 @@ macro(GET_AVAILABLE_PLATFORMS TYPE FLAG_NAME OUT_STR)
endforeach()
foreach(PLATFORM_IT ${${TYPE}_PLATFORM_LIST})
set(${OUT_STR} "${${OUT_STR}} ${PLATFORM_IT}")
list(APPEND ${TYPE}_CORE_FLAGS_DEFINITONS ${FLAG_NAME}_${PLATFORM_IT})
list(APPEND ${TYPE}_CORE_FLAGS_DEFINITIONS ${FLAG_NAME}_${PLATFORM_IT})
endforeach()
endmacro()

Expand Down
8 changes: 4 additions & 4 deletions shared/offline_compiler/source/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ endif()

set(ALL_OCLOC_PRODUCT_FAMILY "")
set(ALL_OCLOC_PRODUCT_TO_PRODUCT_FAMILY "")
set(OCLOC_SUPPORTED_CORE_FLAGS_DEFINITONS "")
set(OCLOC_SUPPORTED_CORE_FLAGS_DEFINITIONS "")

get_cmake_property(OCLOC_SUPPORT_VARS VARIABLES)
list(FILTER OCLOC_SUPPORT_VARS INCLUDE REGEX "OCLOC_SUPPORT_.+")
Expand Down Expand Up @@ -285,7 +285,7 @@ set(NEO_SHARED_COREX_CPP_FILES
)

macro(macro_for_each_platform)
list(APPEND OCLOC_SUPPORTED_CORE_FLAGS_DEFINITONS "-DSUPPORT_${PLATFORM_IT}")
list(APPEND OCLOC_SUPPORTED_CORE_FLAGS_DEFINITIONS "-DSUPPORT_${PLATFORM_IT}")
if(EXISTS ${NEO_SHARED_DIRECTORY}/${CORE_TYPE_LOWER}/definitions${BRANCH_DIR_SUFFIX})
include_directories(${NEO_SHARED_DIRECTORY}/${CORE_TYPE_LOWER}/definitions${BRANCH_DIR_SUFFIX})
elseif(EXISTS ${NEO_SHARED_DIRECTORY}/${CORE_TYPE_LOWER}/definitions)
Expand Down Expand Up @@ -326,7 +326,7 @@ macro(macro_for_each_platform)
endmacro()

macro(macro_for_each_core_type)
list(APPEND OCLOC_SUPPORTED_CORE_FLAGS_DEFINITONS "-DSUPPORT_${CORE_TYPE}")
list(APPEND OCLOC_SUPPORTED_CORE_FLAGS_DEFINITIONS "-DSUPPORT_${CORE_TYPE}")
foreach(SRC_IT ${NEO_SHARED_COREX_CPP_FILES})
foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
foreach(BRANCH ${BRANCH_DIR_LIST})
Expand Down Expand Up @@ -389,7 +389,7 @@ endif()
target_include_directories(${OCLOC_NAME}_lib BEFORE PRIVATE ${CLOC_LIB_INCLUDES})
target_include_directories(${OCLOC_NAME}_lib BEFORE PRIVATE ${IGA_INCLUDE_DIR})

target_compile_definitions(${OCLOC_NAME}_lib PUBLIC ${CLOC_LIB_LIB_FLAGS_DEFINITIONS} ${OCLOC_SUPPORTED_CORE_FLAGS_DEFINITONS} DEFAULT_PLATFORM=${DEFAULT_SUPPORTED_PLATFORM}
target_compile_definitions(${OCLOC_NAME}_lib PUBLIC ${CLOC_LIB_LIB_FLAGS_DEFINITIONS} ${OCLOC_SUPPORTED_CORE_FLAGS_DEFINITIONS} DEFAULT_PLATFORM=${DEFAULT_SUPPORTED_PLATFORM}
IGA_LIBRARY_NAME="${IGA_LIBRARY_FILENAME}"
${AOT_DEFINITIONS}
)
Expand Down
4 changes: 2 additions & 2 deletions shared/source/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ function(generate_shared_lib LIB_NAME MOCKABLE)
${CORE_SOURCES}
)
if(${MOCKABLE})
target_compile_definitions(${LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=virtual MOCKABLE= DEFAULT_TEST_PLATFORM=${DEFAULT_TESTED_PLATFORM} ${TESTED_CORE_FLAGS_DEFINITONS})
target_compile_definitions(${LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=virtual MOCKABLE= DEFAULT_TEST_PLATFORM=${DEFAULT_TESTED_PLATFORM} ${TESTED_CORE_FLAGS_DEFINITIONS})
else()
target_compile_definitions(${LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=)
if(WIN32 AND NOT RELEASE_WITH_REGKEYS)
target_compile_definitions(${LIB_NAME} PUBLIC $<$<CONFIG:Release>:NEO_USE_CONSTEXPR_DEBUG_VARIABLES>)
endif()
endif()

list(APPEND LIB_FLAGS_DEFINITIONS ${SUPPORTED_CORE_FLAGS_DEFINITONS})
list(APPEND LIB_FLAGS_DEFINITIONS ${SUPPORTED_CORE_FLAGS_DEFINITIONS})
list(APPEND LIB_FLAGS_DEFINITIONS ${AOT_DEFINITIONS})

set_property(TARGET ${LIB_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS})
Expand Down
Loading