mirror of
https://github.com/opencv/opencv.git
synced 2026-09-25 04:09:57 +03:00
Merge pull request #29876 from Kumataro:fix29819_stop_downloading_unifont_when_HarfBuzz_is_disabled
imgproc: skip downloading unifont when HarfBuzz is disabled
This commit is contained in:
@@ -27,6 +27,7 @@ if(HAVE_IPP)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(HAVE_HARFBUZZ)
|
||||
set(UNIFONT_MD5 "fb79cf5b4f4c89414f1233f14c2eb273")
|
||||
set(UNIFONT_NAME "WenQuanYiMicroHei.ttf.gz")
|
||||
set(UNIFONT_COMMIT "cc7d85179d69a704bee209aa37ce8a657f2f8b34")
|
||||
@@ -66,7 +67,6 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}")
|
||||
ocv_target_link_libraries(${the_module} LINK_PRIVATE ${ZLIB_LIBRARIES})
|
||||
ocv_install_3rdparty_licenses(fonts fonts/Rubik_OFL.txt)
|
||||
|
||||
if(HAVE_HARFBUZZ)
|
||||
ocv_module_include_directories(opencv_imgproc ${HARFBUZZ_INCLUDE_DIR})
|
||||
ocv_target_link_libraries(${the_module} LINK_PRIVATE ${HARFBUZZ_LIBRARIES})
|
||||
if(HARFBUZZ_IS_BUNDLED)
|
||||
|
||||
Reference in New Issue
Block a user