From eda1ab44ac0524201de189dc0eaa4222383b749b Mon Sep 17 00:00:00 2001 From: arcum42 Date: Sat, 17 Aug 2019 20:33:14 -0700 Subject: [PATCH] Add harfbuzz as a dependency to play nice with pango 1.44+. --- cmake/FindHarfBuzz.cmake | 42 ++++++++++++++++++++++++++++++++++++++ cmake/SearchForStuff.cmake | 3 +++ 2 files changed, 45 insertions(+) create mode 100644 cmake/FindHarfBuzz.cmake diff --git a/cmake/FindHarfBuzz.cmake b/cmake/FindHarfBuzz.cmake new file mode 100644 index 0000000000..601a95862d --- /dev/null +++ b/cmake/FindHarfBuzz.cmake @@ -0,0 +1,42 @@ + +# Copyright (c) 2012, Intel Corporation +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, this +# list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# * Neither the name of Intel Corporation nor the names of its contributors may +# be used to endorse or promote products derived from this software without +# specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +# Try to find Harfbuzz include and library directories. +# +# After successful discovery, this will set for inclusion where needed: +# HARFBUZZ_INCLUDE_DIRS - containg the HarfBuzz headers +# HARFBUZZ_LIBRARIES - containg the HarfBuzz library +INCLUDE(FindPkgConfig) +PKG_CHECK_MODULES(PC_HARFBUZZ harfbuzz>=0.9.0) +FIND_PATH(HARFBUZZ_INCLUDE_DIRS NAMES hb.h + HINTS ${PC_HARFBUZZ_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR} +) +FIND_LIBRARY(HARFBUZZ_LIBRARIES NAMES harfbuzz + HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR} +) +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(HarfBuzz DEFAULT_MSG HARFBUZZ_INCLUDE_DIRS HARFBUZZ_LIBRARIES) diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake index 504a879ca3..25bb69f667 100644 --- a/cmake/SearchForStuff.cmake +++ b/cmake/SearchForStuff.cmake @@ -191,6 +191,9 @@ if(ZLIB_FOUND) include_directories(${ZLIB_INCLUDE_DIRS}) endif() +find_package(HarfBuzz REQUIRED) +include_directories(${HARFBUZZ_INCLUDE_DIRS}) + #---------------------------------------- # Use project-wide include directories #----------------------------------------