diff options
-rw-r--r-- | Depends.cmake | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Depends.cmake b/Depends.cmake index c3decd7a..aaa2e8ea 100644 --- a/Depends.cmake +++ b/Depends.cmake | |||
@@ -43,12 +43,13 @@ else () | |||
43 | endif () | 43 | endif () |
44 | endif () | 44 | endif () |
45 | 45 | ||
46 | if (ENABLE_HARFBUZZ AND EXISTS ${CMAKE_SOURCE_DIR}/lib/harfbuzz/CMakeLists.txt) | 46 | if (ENABLE_HARFBUZZ) |
47 | # Find HarfBuzz with pkg-config. | 47 | # Find HarfBuzz with pkg-config. |
48 | if (NOT ENABLE_HARFBUZZ_MINIMAL AND PKG_CONFIG_FOUND) | 48 | if (NOT ENABLE_HARFBUZZ_MINIMAL AND PKG_CONFIG_FOUND) |
49 | pkg_check_modules (HARFBUZZ IMPORTED_TARGET harfbuzz) | 49 | pkg_check_modules (HARFBUZZ IMPORTED_TARGET harfbuzz) |
50 | endif () | 50 | endif () |
51 | if (ENABLE_HARFBUZZ_MINIMAL OR NOT HARFBUZZ_FOUND) | 51 | if (EXISTS ${CMAKE_SOURCE_DIR}/lib/harfbuzz/CMakeLists.txt AND |
52 | (ENABLE_HARFBUZZ_MINIMAL OR NOT HARFBUZZ_FOUND)) | ||
52 | # Build HarfBuzz with minimal dependencies. | 53 | # Build HarfBuzz with minimal dependencies. |
53 | if (MESON_EXECUTABLE AND NINJA_EXECUTABLE) | 54 | if (MESON_EXECUTABLE AND NINJA_EXECUTABLE) |
54 | set (_dst ${CMAKE_BINARY_DIR}/lib/harfbuzz) | 55 | set (_dst ${CMAKE_BINARY_DIR}/lib/harfbuzz) |
@@ -107,12 +108,12 @@ if (ENABLE_HARFBUZZ AND EXISTS ${CMAKE_SOURCE_DIR}/lib/harfbuzz/CMakeLists.txt) | |||
107 | endif () | 108 | endif () |
108 | endif () | 109 | endif () |
109 | 110 | ||
110 | if (ENABLE_FRIBIDI AND EXISTS ${CMAKE_SOURCE_DIR}/lib/fribidi) | 111 | if (ENABLE_FRIBIDI) |
111 | # Find FriBidi with pkg-config. | 112 | # Find FriBidi with pkg-config. |
112 | if (NOT ENABLE_FRIBIDI_BUILD AND PKG_CONFIG_FOUND) | 113 | if (NOT ENABLE_FRIBIDI_BUILD AND PKG_CONFIG_FOUND) |
113 | pkg_check_modules (FRIBIDI IMPORTED_TARGET fribidi) | 114 | pkg_check_modules (FRIBIDI IMPORTED_TARGET fribidi) |
114 | endif () | 115 | endif () |
115 | if (ENABLE_FRIBIDI_BUILD OR NOT FRIBIDI_FOUND) | 116 | if (EXISTS ${CMAKE_SOURCE_DIR}/lib/fribidi AND (ENABLE_FRIBIDI_BUILD OR NOT FRIBIDI_FOUND)) |
116 | # Build FriBidi with Meson. | 117 | # Build FriBidi with Meson. |
117 | set (_dst ${CMAKE_BINARY_DIR}/lib/fribidi) | 118 | set (_dst ${CMAKE_BINARY_DIR}/lib/fribidi) |
118 | if (MESON_EXECUTABLE AND NINJA_EXECUTABLE) | 119 | if (MESON_EXECUTABLE AND NINJA_EXECUTABLE) |