From 4b0157fa984b109618dd1fdb8464f9cf20028617 Mon Sep 17 00:00:00 2001 From: Jaakko Keränen Date: Mon, 26 Jul 2021 14:59:47 +0300 Subject: Depends: Even more build fixes --- CMakeLists.txt | 1 + Depends.cmake | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b4b3a9c1..c5d5f610 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -321,6 +321,7 @@ if (ENABLE_HARFBUZZ AND HARFBUZZ_FOUND) target_link_libraries (app PUBLIC harfbuzz-lib) else () target_link_libraries (app PUBLIC ${HARFBUZZ_LIBRARIES}) + target_include_directories (app PUBLIC ${HARFBUZZ_INCLUDE_DIRS}) endif () target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_HARFBUZZ=1) endif () diff --git a/Depends.cmake b/Depends.cmake index ad740478..612ad0dc 100644 --- a/Depends.cmake +++ b/Depends.cmake @@ -12,9 +12,6 @@ if (ENABLE_HARFBUZZ AND EXISTS ${CMAKE_SOURCE_DIR}/lib/harfbuzz/CMakeLists.txt) # Find HarfBuzz with pkg-config. if (NOT ENABLE_HARFBUZZ_MINIMAL AND PKG_CONFIG_FOUND) pkg_check_modules (HARFBUZZ IMPORTED_TARGET harfbuzz) - if (HARFBUZZ_FOUND) - add_library (harfbuzz-lib ALIAS PkgConfig::HARFBUZZ) - endif () endif () if (ENABLE_HARFBUZZ_MINIMAL OR NOT HARFBUZZ_FOUND) # Build HarfBuzz with minimal dependencies. @@ -46,7 +43,7 @@ if (ENABLE_HARFBUZZ AND EXISTS ${CMAKE_SOURCE_DIR}/lib/harfbuzz/CMakeLists.txt) target_link_libraries (harfbuzz-lib INTERFACE ${_dst}/lib/libharfbuzz.0.dylib) target_link_libraries (harfbuzz-lib INTERFACE c++) else () - target_link_libraries (harfbuzz-lib INTERFACE ${_dst}/libharfbuzz.a) + target_link_libraries (harfbuzz-lib INTERFACE ${_dst}/lib/libharfbuzz.a) target_link_libraries (harfbuzz-lib INTERFACE stdc++) endif () endif () -- cgit v1.2.3