IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed gtest build / usage in case of RelWithDebInfo (#4554)

Browse Source 
* Fixed gtest build / usage in case of RelWithDebInfo

* Added more modules to fluid_preproc_tests tests
This commit is contained in:
Ilya Lavrenov 2021-03-03 07:27:23 +03:00 committed by GitHub
parent f5da64db8a
commit 1d88cdc45e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
inference-engine/tests_deprecated/fluid_preproc/CMakeLists.txt
View File

@ -1,10 +1,10 @@
# Copyright (C) 2018-2020 Intel Corporation # Copyright (C) 2018-2021 Intel Corporation
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
set(TARGET fluid_preproc_tests) set(TARGET fluid_preproc_tests)
find_package(OpenCV COMPONENTS gapi QUIET) find_package(OpenCV COMPONENTS gapi core imgproc QUIET)
if(NOT OpenCV_FOUND) if(NOT OpenCV_FOUND)
message(WARNING "No suitable OpenCV version detected, ${TARGET} skipped") message(WARNING "No suitable OpenCV version detected, ${TARGET} skipped")
return() return()
@ -23,12 +23,13 @@ target_include_directories(${TARGET} PRIVATE
$<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES> $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_preproc,INTERFACE_INCLUDE_DIRECTORIES>) $<TARGET_PROPERTY:inference_engine_preproc,INTERFACE_INCLUDE_DIRECTORIES>)
target_link_libraries(${TARGET} PRIVATE opencv_core opencv_imgproc inference_engine fluid_test_computations gtest gtest_main) target_link_libraries(${TARGET} PRIVATE opencv_core opencv_imgproc
inference_engine fluid_test_computations gtest gtest_main)
if(GAPI_TEST_PERF) if(GAPI_TEST_PERF)
target_compile_definitions(${TARGET} PRIVATE -DPERF_TEST=1) target_compile_definitions(${TARGET} PRIVATE -DPERF_TEST=1)
else() else()
target_compile_definitions(${TARGET} PRIVATE -DPERF_TEST=0) target_compile_definitions(${TARGET} PRIVATE -DPERF_TEST=0)
endif() endif()
add_test(NAME ${TARGET} COMMAND ${TARGET}) add_test(NAME ${TARGET} COMMAND ${TARGET})

1
ngraph/cmake/external_gtest.cmake
View File

@ -30,6 +30,7 @@ set(GTEST_OUTPUT_DIR ${GMOCK_OUTPUT_DIR}/gtest)
if(WIN32) if(WIN32)
list(APPEND GTEST_CMAKE_ARGS list(APPEND GTEST_CMAKE_ARGS
-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE=${GTEST_OUTPUT_DIR} -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE=${GTEST_OUTPUT_DIR}
-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO=${GTEST_OUTPUT_DIR}
-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG=${GTEST_OUTPUT_DIR} -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG=${GTEST_OUTPUT_DIR}
-Dgtest_force_shared_crt=TRUE -Dgtest_force_shared_crt=TRUE
) )