diff options
author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-07-26 14:59:47 +0300 |
---|---|---|
committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-07-26 16:52:42 +0300 |
commit | 4b0157fa984b109618dd1fdb8464f9cf20028617 (patch) | |
tree | 60cb2bbf3dda457d7a2a897a569ebe884b8cfa77 /Depends.cmake | |
parent | 57558ccdd415df5c460c3d4b7b3776942fea68c8 (diff) |
Depends: Even more build fixes
Diffstat (limited to 'Depends.cmake')
-rw-r--r-- | Depends.cmake | 5 |
1 files changed, 1 insertions, 4 deletions
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 () |