Fixed FAST build mode (#2926)

This commit is contained in:
Ilya Lavrenov 2020-11-02 17:58:52 +03:00 committed by GitHub
parent 5ffa2cd5e3
commit f2963713d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions

View File

@ -12,7 +12,7 @@ file (GLOB LIBRARY_SRC
# TODO: WA for OneHot pass usage in reshape # TODO: WA for OneHot pass usage in reshape
set(LEGACY_SRC_ROOT "${IE_MAIN_SOURCE_DIR}/src/legacy_api/src/") set(LEGACY_SRC_ROOT "${IE_MAIN_SOURCE_DIR}/src/legacy_api/src/")
list(APPEND LIBRARY_SRC set(LEGACY_LIBRARY_SHARED_SRCS
"${LEGACY_SRC_ROOT}/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.cpp" "${LEGACY_SRC_ROOT}/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.cpp"
"${LEGACY_SRC_ROOT}/ngraph_ops/onehot_ie.cpp") "${LEGACY_SRC_ROOT}/ngraph_ops/onehot_ie.cpp")
@ -125,6 +125,7 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}_obj)
add_library(${TARGET_NAME} SHARED add_library(${TARGET_NAME} SHARED
${IE_STATIC_DEPENDENT_FILES} ${IE_STATIC_DEPENDENT_FILES}
${LEGACY_LIBRARY_SHARED_SRCS}
${vs_version_file} ${vs_version_file}
$<TARGET_OBJECTS:${TARGET_NAME}_obj>) $<TARGET_OBJECTS:${TARGET_NAME}_obj>)
@ -137,7 +138,8 @@ target_link_libraries(${TARGET_NAME} PRIVATE pugixml openvino::itt ${CMAKE_DL_LI
${NGRAPH_LIBRARIES} inference_engine_transformations) ${NGRAPH_LIBRARIES} inference_engine_transformations)
target_include_directories(${TARGET_NAME} INTERFACE ${PUBLIC_HEADERS_DIR} target_include_directories(${TARGET_NAME} INTERFACE ${PUBLIC_HEADERS_DIR}
PRIVATE $<TARGET_PROPERTY:${TARGET_NAME}_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>) PRIVATE $<TARGET_PROPERTY:${TARGET_NAME}_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:${TARGET_NAME}_legacy,INTERFACE_INCLUDE_DIRECTORIES>)
if(WIN32) if(WIN32)
set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}) set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME})

View File

@ -39,8 +39,6 @@ function(add_common_target TARGET_NAME STATIC_IE)
$<TARGET_PROPERTY:inference_engine_legacy,INTERFACE_INCLUDE_DIRECTORIES>) $<TARGET_PROPERTY:inference_engine_legacy,INTERFACE_INCLUDE_DIRECTORIES>)
if(WIN32) if(WIN32)
target_compile_definitions(${TARGET_NAME} PRIVATE NOMINMAX)
set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}) set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME})
endif() endif()
@ -54,6 +52,10 @@ function(add_common_target TARGET_NAME STATIC_IE)
target_link_libraries(${TARGET_NAME} PUBLIC ${NGRAPH_LIBRARIES} inference_engine_transformations target_link_libraries(${TARGET_NAME} PUBLIC ${NGRAPH_LIBRARIES} inference_engine_transformations
PRIVATE openvino::itt) PRIVATE openvino::itt)
if(NOT STATIC_IE)
target_link_libraries(${TARGET_NAME} PUBLIC inference_engine_legacy)
endif()
endfunction() endfunction()
add_common_target("vpu_common_lib" FALSE) add_common_target("vpu_common_lib" FALSE)