diff options
-rw-r--r-- | CMakeLists.txt | 1 | ||||
-rw-r--r-- | 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) | |||
321 | target_link_libraries (app PUBLIC harfbuzz-lib) | 321 | target_link_libraries (app PUBLIC harfbuzz-lib) |
322 | else () | 322 | else () |
323 | target_link_libraries (app PUBLIC ${HARFBUZZ_LIBRARIES}) | 323 | target_link_libraries (app PUBLIC ${HARFBUZZ_LIBRARIES}) |
324 | target_include_directories (app PUBLIC ${HARFBUZZ_INCLUDE_DIRS}) | ||
324 | endif () | 325 | endif () |
325 | target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_HARFBUZZ=1) | 326 | target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_HARFBUZZ=1) |
326 | endif () | 327 | 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) | |||
12 | # Find HarfBuzz with pkg-config. | 12 | # Find HarfBuzz with pkg-config. |
13 | if (NOT ENABLE_HARFBUZZ_MINIMAL AND PKG_CONFIG_FOUND) | 13 | if (NOT ENABLE_HARFBUZZ_MINIMAL AND PKG_CONFIG_FOUND) |
14 | pkg_check_modules (HARFBUZZ IMPORTED_TARGET harfbuzz) | 14 | pkg_check_modules (HARFBUZZ IMPORTED_TARGET harfbuzz) |
15 | if (HARFBUZZ_FOUND) | ||
16 | add_library (harfbuzz-lib ALIAS PkgConfig::HARFBUZZ) | ||
17 | endif () | ||
18 | endif () | 15 | endif () |
19 | if (ENABLE_HARFBUZZ_MINIMAL OR NOT HARFBUZZ_FOUND) | 16 | if (ENABLE_HARFBUZZ_MINIMAL OR NOT HARFBUZZ_FOUND) |
20 | # Build HarfBuzz with minimal dependencies. | 17 | # Build HarfBuzz with minimal dependencies. |
@@ -46,7 +43,7 @@ if (ENABLE_HARFBUZZ AND EXISTS ${CMAKE_SOURCE_DIR}/lib/harfbuzz/CMakeLists.txt) | |||
46 | target_link_libraries (harfbuzz-lib INTERFACE ${_dst}/lib/libharfbuzz.0.dylib) | 43 | target_link_libraries (harfbuzz-lib INTERFACE ${_dst}/lib/libharfbuzz.0.dylib) |
47 | target_link_libraries (harfbuzz-lib INTERFACE c++) | 44 | target_link_libraries (harfbuzz-lib INTERFACE c++) |
48 | else () | 45 | else () |
49 | target_link_libraries (harfbuzz-lib INTERFACE ${_dst}/libharfbuzz.a) | 46 | target_link_libraries (harfbuzz-lib INTERFACE ${_dst}/lib/libharfbuzz.a) |
50 | target_link_libraries (harfbuzz-lib INTERFACE stdc++) | 47 | target_link_libraries (harfbuzz-lib INTERFACE stdc++) |
51 | endif () | 48 | endif () |
52 | endif () | 49 | endif () |