Fixed build with FREETYPE and without tests.

diff --git a/modules/gapi/CMakeLists.txt b/modules/gapi/CMakeLists.txt
index 1f14b2a..519ebba 100644 (file)
--- a/modules/gapi/CMakeLists.txt
+++ b/modules/gapi/CMakeLists.txt
@@ -148,17 +148,21 @@ if(TARGET opencv_test_gapi)
 endif()
 
 if(HAVE_FREETYPE)
-  ocv_target_compile_definitions(opencv_gapi      PRIVATE -DHAVE_FREETYPE)
-  ocv_target_compile_definitions(opencv_test_gapi PRIVATE -DHAVE_FREETYPE)
-  ocv_target_link_libraries(opencv_gapi PRIVATE ${FREETYPE_LIBRARIES})
-  ocv_target_include_directories(opencv_gapi PRIVATE ${FREETYPE_INCLUDE_DIRS})
+  ocv_target_compile_definitions(${the_module} PRIVATE -DHAVE_FREETYPE)
+  if(TARGET opencv_test_gapi)
+    ocv_target_compile_definitions(opencv_test_gapi PRIVATE -DHAVE_FREETYPE)
+  endif()
+  ocv_target_link_libraries(${the_module} PRIVATE ${FREETYPE_LIBRARIES})
+  ocv_target_include_directories(${the_module} PRIVATE ${FREETYPE_INCLUDE_DIRS})
 endif()
 
 if(HAVE_PLAIDML)
-  ocv_target_compile_definitions(opencv_gapi      PRIVATE -DHAVE_PLAIDML)
-  ocv_target_compile_definitions(opencv_test_gapi PRIVATE -DHAVE_PLAIDML)
-  ocv_target_link_libraries(opencv_gapi PRIVATE ${PLAIDML_LIBRARIES})
-  ocv_target_include_directories(opencv_gapi SYSTEM PRIVATE ${PLAIDML_INCLUDE_DIRS})
+  ocv_target_compile_definitions(${the_module} PRIVATE -DHAVE_PLAIDML)
+  if(TARGET opencv_test_gapi)
+    ocv_target_compile_definitions(opencv_test_gapi PRIVATE -DHAVE_PLAIDML)
+  endif()
+  ocv_target_link_libraries(${the_module} PRIVATE ${PLAIDML_LIBRARIES})
+  ocv_target_include_directories(${the_module} SYSTEM PRIVATE ${PLAIDML_INCLUDE_DIRS})
 endif()
 
 ocv_add_perf_tests()