build: eliminate build warnings on Ubuntu 20.04/16.04

diff --git a/modules/gapi/CMakeLists.txt b/modules/gapi/CMakeLists.txt
index 3deb518d6288924776e6f285bf2ce76599ebf724..2553b3ce8dcef2122799f7784fab2858b712752a 100644 (file)
--- a/modules/gapi/CMakeLists.txt
+++ b/modules/gapi/CMakeLists.txt
@@ -382,7 +382,7 @@ if(TARGET example_gapi_onevpl_infer_with_advanced_device_selection)
     ocv_target_include_directories(example_gapi_onevpl_infer_with_advanced_device_selection SYSTEM PRIVATE ${OPENCL_INCLUDE_DIRS})
   endif()
   if(UNIX AND HAVE_VA)
-    message ("GAPI VPL samples with VAAPI")
+    message(STATUS "GAPI VPL samples with VAAPI")
     ocv_target_include_directories(example_gapi_onevpl_infer_with_advanced_device_selection SYSTEM PRIVATE ${VA_INCLUDE_DIR})
     ocv_target_link_libraries(example_gapi_onevpl_infer_with_advanced_device_selection PRIVATE ${VA_LIBRARIES})
   endif()

diff --git a/modules/gapi/src/executor/gtbbexecutor.hpp b/modules/gapi/src/executor/gtbbexecutor.hpp
index 3c2bf1ff980412e67cc14a62fefad617a8902dbe..342ba4817f533d230660a13adf100a90500d1acc 100644 (file)
--- a/modules/gapi/src/executor/gtbbexecutor.hpp
+++ b/modules/gapi/src/executor/gtbbexecutor.hpp
@@ -12,6 +12,9 @@
 #endif
 
 #ifdef HAVE_TBB
+#ifndef TBB_SUPPRESS_DEPRECATED_MESSAGES
+#define TBB_SUPPRESS_DEPRECATED_MESSAGES 1
+#endif
 #include <tbb/tbb.h>
 #include <tbb/task.h>
 #if TBB_INTERFACE_VERSION < 12000

diff --git a/modules/gapi/test/executor/gtbbexecutor_internal_tests.cpp b/modules/gapi/test/executor/gtbbexecutor_internal_tests.cpp
index e1b93af98bcaf0c35b27d2f6b280d2dad5782556..766ec6b0b26087376de82d8f96a4bd815a51c91c 100644 (file)
--- a/modules/gapi/test/executor/gtbbexecutor_internal_tests.cpp
+++ b/modules/gapi/test/executor/gtbbexecutor_internal_tests.cpp
@@ -50,7 +50,7 @@ TEST(TBBExecutor, Basic) {
     });
     q.push(&n);
     execute(q);
-    EXPECT_EQ(true, executed);
+    EXPECT_TRUE(executed);
 }
 
 TEST(TBBExecutor, SerialExecution) {
@@ -117,8 +117,8 @@ TEST(TBBExecutor, AsyncBasic) {
 
     async_thread.join();
 
-    EXPECT_EQ(true, callback_called);
-    EXPECT_EQ(true, master_was_blocked_until_callback_called);
+    EXPECT_TRUE(callback_called);
+    EXPECT_TRUE(master_was_blocked_until_callback_called);
 }
 
 TEST(TBBExecutor, Dependencies) {

diff --git a/modules/gapi/test/streaming/gapi_gstreamer_pipeline_facade_int_tests.cpp b/modules/gapi/test/streaming/gapi_gstreamer_pipeline_facade_int_tests.cpp
index 7b809a8847197d92dfa05c04bf02a189282665af..6a3fb38d5ed2a93e146e5925623795a51e1ce394 100644 (file)
--- a/modules/gapi/test/streaming/gapi_gstreamer_pipeline_facade_int_tests.cpp
+++ b/modules/gapi/test/streaming/gapi_gstreamer_pipeline_facade_int_tests.cpp
@@ -138,9 +138,9 @@ TEST(GStreamerPipelineFacadeTest, IsPlayingUnitTest)
                        "video/x-raw,width=1920,height=1080,framerate=3/1 ! "
                        "appsink name=sink2");
 
-    EXPECT_EQ(false, pipelineFacade.isPlaying());
+    EXPECT_FALSE(pipelineFacade.isPlaying());
     pipelineFacade.play();
-    EXPECT_EQ(true, pipelineFacade.isPlaying());
+    EXPECT_TRUE(pipelineFacade.isPlaying());
 }
 
 TEST(GStreamerPipelineFacadeTest, MTSafetyUnitTest)