From 122b1f3bbd18b986cc47f0803b54013525a4fdd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 21 Feb 2013 14:57:27 +0100 Subject: [PATCH] Require HarfBuzz in FindMagnum.cmake only if it was compiled with it. --- modules/FindMagnum.cmake | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake index 55ec02cf1..240c27e83 100644 --- a/modules/FindMagnum.cmake +++ b/modules/FindMagnum.cmake @@ -90,6 +90,10 @@ string(FIND "${_magnumConfigure}" "#define MAGNUM_TARGET_DESKTOP_GLES" _TARGET_D if(NOT _TARGET_DESKTOP_GLES EQUAL -1) set(MAGNUM_TARGET_DESKTOP_GLES 1) endif() +string(FIND "${_magnumConfigure}" "#define MAGNUM_USE_HARFBUZZ" _USE_HARFBUZZ) +if(NOT _USE_HARFBUZZ EQUAL -1) + set(MAGNUM_USE_HARFBUZZ 1) +endif() if(NOT MAGNUM_TARGET_GLES OR MAGNUM_TARGET_DESKTOP_GLES) find_package(OpenGL REQUIRED) @@ -212,10 +216,15 @@ foreach(component ${Magnum_FIND_COMPONENTS}) # Dependencies find_package(FreeType) - find_package(HarfBuzz) - if(NOT FREETYPE_FOUND OR NOT HARFBUZZ_FOUND) + if(NOT FREETYPE_FOUND) unset(MAGNUM_${_COMPONENT}_LIBRARY) endif() + if(MAGNUM_USE_HARFBUZZ) + find_package(HarfBuzz) + if(NOT HARFBUZZ_FOUND) + unset(MAGNUM_${_COMPONENT}_LIBRARY) + endif() + endif() endif() # TextureTools library