diff options
author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-07-26 13:36:40 +0300 |
---|---|---|
committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-07-26 13:45:33 +0300 |
commit | e4ad744fcbd733a5014873147c8d8dc46a38be8a (patch) | |
tree | 82f6c8e41781e03af8929994887be9e9e98617dc | |
parent | 876a474b787be5d0b426a05f17848955644b1c0e (diff) |
macOS: Fixing linking with HarfBuzz
-rw-r--r-- | Depends.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Depends.cmake b/Depends.cmake index ded2d3c7..a80d4cfd 100644 --- a/Depends.cmake +++ b/Depends.cmake | |||
@@ -32,7 +32,6 @@ if (ENABLE_HARFBUZZ AND EXISTS ${CMAKE_SOURCE_DIR}/lib/harfbuzz/CMakeLists.txt) | |||
32 | --prefix ${_dst} | 32 | --prefix ${_dst} |
33 | BUILD_COMMAND ${NINJA_EXECUTABLE} | 33 | BUILD_COMMAND ${NINJA_EXECUTABLE} |
34 | INSTALL_COMMAND ${NINJA_EXECUTABLE} install | 34 | INSTALL_COMMAND ${NINJA_EXECUTABLE} install |
35 | BUILD_BYPRODUCTS ${_dst}/libharfbuzz.a | ||
36 | ) | 35 | ) |
37 | add_library (harfbuzz-lib INTERFACE) | 36 | add_library (harfbuzz-lib INTERFACE) |
38 | add_dependencies (harfbuzz-lib harfbuzz-ext) | 37 | add_dependencies (harfbuzz-lib harfbuzz-ext) |
@@ -42,10 +41,11 @@ if (ENABLE_HARFBUZZ AND EXISTS ${CMAKE_SOURCE_DIR}/lib/harfbuzz/CMakeLists.txt) | |||
42 | target_link_libraries (harfbuzz-lib INTERFACE -L${_dst}/lib harfbuzz) | 41 | target_link_libraries (harfbuzz-lib INTERFACE -L${_dst}/lib harfbuzz) |
43 | install (PROGRAMS ${_dst}/bin/msys-harfbuzz-0.dll DESTINATION .) | 42 | install (PROGRAMS ${_dst}/bin/msys-harfbuzz-0.dll DESTINATION .) |
44 | else () | 43 | else () |
45 | target_link_libraries (harfbuzz-lib INTERFACE ${_dst}/libharfbuzz.a) | ||
46 | if (APPLE) | 44 | if (APPLE) |
45 | target_link_libraries (harfbuzz-lib INTERFACE ${_dst}/lib/libharfbuzz.0.dylib) | ||
47 | target_link_libraries (harfbuzz-lib INTERFACE c++) | 46 | target_link_libraries (harfbuzz-lib INTERFACE c++) |
48 | else () | 47 | else () |
48 | target_link_libraries (harfbuzz-lib INTERFACE ${_dst}/libharfbuzz.a) | ||
49 | target_link_libraries (harfbuzz-lib INTERFACE stdc++) | 49 | target_link_libraries (harfbuzz-lib INTERFACE stdc++) |
50 | endif () | 50 | endif () |
51 | endif () | 51 | endif () |