From 1d88cdc45ea2aa0aef5321d16261f930cc683a0b Mon Sep 17 00:00:00 2001
From: Ilya Lavrenov <ilya.lavrenov@intel.com>
Date: Wed, 3 Mar 2021 07:27:23 +0300
Subject: [PATCH] Fixed gtest build / usage in case of RelWithDebInfo (#4554)

* Fixed gtest build / usage in case of RelWithDebInfo

* Added more modules to fluid_preproc_tests tests
---
 .../tests_deprecated/fluid_preproc/CMakeLists.txt     | 11 ++++++-----
 ngraph/cmake/external_gtest.cmake                     |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/inference-engine/tests_deprecated/fluid_preproc/CMakeLists.txt b/inference-engine/tests_deprecated/fluid_preproc/CMakeLists.txt
index 959c3314412..fd78ef95636 100644
--- a/inference-engine/tests_deprecated/fluid_preproc/CMakeLists.txt
+++ b/inference-engine/tests_deprecated/fluid_preproc/CMakeLists.txt
@@ -1,10 +1,10 @@
-# Copyright (C) 2018-2020 Intel Corporation
+# Copyright (C) 2018-2021 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 
 set(TARGET fluid_preproc_tests)
 
-find_package(OpenCV COMPONENTS gapi QUIET)
+find_package(OpenCV COMPONENTS gapi core imgproc QUIET)
 if(NOT OpenCV_FOUND)
     message(WARNING "No suitable OpenCV version detected, ${TARGET} skipped")
     return()
@@ -23,12 +23,13 @@ target_include_directories(${TARGET} PRIVATE
           $<TARGET_PROPERTY:inference_engine_plugin_api,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)
-  target_compile_definitions(${TARGET} PRIVATE -DPERF_TEST=1)
+    target_compile_definitions(${TARGET} PRIVATE -DPERF_TEST=1)
 else()
-  target_compile_definitions(${TARGET} PRIVATE -DPERF_TEST=0)
+    target_compile_definitions(${TARGET} PRIVATE -DPERF_TEST=0)
 endif()
 
 add_test(NAME ${TARGET} COMMAND ${TARGET})
diff --git a/ngraph/cmake/external_gtest.cmake b/ngraph/cmake/external_gtest.cmake
index 7401f9af8d0..cff9d6f7a75 100644
--- a/ngraph/cmake/external_gtest.cmake
+++ b/ngraph/cmake/external_gtest.cmake
@@ -30,6 +30,7 @@ set(GTEST_OUTPUT_DIR ${GMOCK_OUTPUT_DIR}/gtest)
 if(WIN32)
     list(APPEND GTEST_CMAKE_ARGS
         -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE=${GTEST_OUTPUT_DIR}
+        -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO=${GTEST_OUTPUT_DIR}
         -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG=${GTEST_OUTPUT_DIR}
         -Dgtest_force_shared_crt=TRUE
     )