From a9a33d9a5fe156ef63af5ce4e0867be58c17da18 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Mon, 3 Feb 2020 16:41:31 +0300 Subject: [PATCH] Fixed build with FREETYPE and without tests. --- modules/gapi/CMakeLists.txt | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/modules/gapi/CMakeLists.txt b/modules/gapi/CMakeLists.txt index 1f14b2a611..519ebba4aa 100644 --- 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()