diff options
author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-07-15 12:03:55 +0300 |
---|---|---|
committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-07-15 12:03:55 +0300 |
commit | 997d3b62a12dd32c5c215e6ed2960999c6babf48 (patch) | |
tree | d21c698afc02970200cc4d3717a2b735a91bf3ba | |
parent | 9b664e4be6953a038adb7698efc46fd26c5771bf (diff) |
Disable further HarfBuzz dependencies in minimal build
-rw-r--r-- | Depends.cmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Depends.cmake b/Depends.cmake index 846519f0..41217c97 100644 --- a/Depends.cmake +++ b/Depends.cmake | |||
@@ -23,9 +23,11 @@ if (ENABLE_HARFBUZZ AND EXISTS ${CMAKE_SOURCE_DIR}/lib/harfbuzz/CMakeLists.txt) | |||
23 | ExternalProject_Add (harfbuzz | 23 | ExternalProject_Add (harfbuzz |
24 | PREFIX ${CMAKE_BINARY_DIR}/harfbuzz-ext | 24 | PREFIX ${CMAKE_BINARY_DIR}/harfbuzz-ext |
25 | SOURCE_DIR ${CMAKE_SOURCE_DIR}/lib/harfbuzz | 25 | SOURCE_DIR ${CMAKE_SOURCE_DIR}/lib/harfbuzz |
26 | CONFIGURE_COMMAND NINJA=${NINJA_EXECUTABLE} ${MESON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/lib/harfbuzz | 26 | CONFIGURE_COMMAND NINJA=${NINJA_EXECUTABLE} ${MESON_EXECUTABLE} |
27 | ${CMAKE_SOURCE_DIR}/lib/harfbuzz | ||
27 | -Dbuildtype=release | 28 | -Dbuildtype=release |
28 | -Dtests=disabled -Dglib=disabled -Dgobject=disabled | 29 | -Dtests=disabled -Dglib=disabled -Dgobject=disabled |
30 | -Dcairo=disabled -Dicu=disabled -Dfreetype=disabled | ||
29 | --prefix ${_dst} | 31 | --prefix ${_dst} |
30 | BUILD_COMMAND ${NINJA_EXECUTABLE} | 32 | BUILD_COMMAND ${NINJA_EXECUTABLE} |
31 | INSTALL_COMMAND ${NINJA_EXECUTABLE} install | 33 | INSTALL_COMMAND ${NINJA_EXECUTABLE} install |
@@ -36,6 +38,8 @@ if (ENABLE_HARFBUZZ AND EXISTS ${CMAKE_SOURCE_DIR}/lib/harfbuzz/CMakeLists.txt) | |||
36 | # Link dynamically. | 38 | # Link dynamically. |
37 | target_link_libraries (harfbuzz-lib INTERFACE -L${_dst}/lib harfbuzz) | 39 | target_link_libraries (harfbuzz-lib INTERFACE -L${_dst}/lib harfbuzz) |
38 | install (PROGRAMS ${_dst}/bin/msys-harfbuzz-0.dll DESTINATION .) | 40 | install (PROGRAMS ${_dst}/bin/msys-harfbuzz-0.dll DESTINATION .) |
41 | else () | ||
42 | target_link_libraries (harfbuzz-lib INTERFACE -L${_dst} harfbuzz) | ||
39 | endif () | 43 | endif () |
40 | set (HARFBUZZ_FOUND YES) | 44 | set (HARFBUZZ_FOUND YES) |
41 | else () | 45 | else () |
@@ -76,7 +80,8 @@ if (ENABLE_FRIBIDI AND EXISTS ${CMAKE_SOURCE_DIR}/lib/fribidi) | |||
76 | ExternalProject_Add (fribidi | 80 | ExternalProject_Add (fribidi |
77 | PREFIX ${CMAKE_BINARY_DIR}/fribidi-ext | 81 | PREFIX ${CMAKE_BINARY_DIR}/fribidi-ext |
78 | SOURCE_DIR ${CMAKE_SOURCE_DIR}/lib/fribidi | 82 | SOURCE_DIR ${CMAKE_SOURCE_DIR}/lib/fribidi |
79 | CONFIGURE_COMMAND NINJA=${NINJA_EXECUTABLE} ${MESON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/lib/fribidi | 83 | CONFIGURE_COMMAND NINJA=${NINJA_EXECUTABLE} ${MESON_EXECUTABLE} |
84 | ${CMAKE_SOURCE_DIR}/lib/fribidi | ||
80 | -Dbuildtype=release | 85 | -Dbuildtype=release |
81 | -Dtests=false -Ddocs=false -Dbin=false | 86 | -Dtests=false -Ddocs=false -Dbin=false |
82 | -Dc_flags=-Wno-macro-redefined | 87 | -Dc_flags=-Wno-macro-redefined |