summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Depends.cmake6
1 files changed, 4 insertions, 2 deletions
diff --git a/Depends.cmake b/Depends.cmake
index a80d4cfd..ad740478 100644
--- a/Depends.cmake
+++ b/Depends.cmake
@@ -32,9 +32,10 @@ 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 STEP_TARGETS install
35 ) 36 )
36 add_library (harfbuzz-lib INTERFACE) 37 add_library (harfbuzz-lib INTERFACE)
37 add_dependencies (harfbuzz-lib harfbuzz-ext) 38 add_dependencies (harfbuzz-lib harfbuzz-install harfbuzz-ext)
38 target_include_directories (harfbuzz-lib INTERFACE ${_dst}/include/harfbuzz) 39 target_include_directories (harfbuzz-lib INTERFACE ${_dst}/include/harfbuzz)
39 if (MSYS) 40 if (MSYS)
40 # Link dynamically. 41 # Link dynamically.
@@ -98,6 +99,7 @@ if (ENABLE_FRIBIDI AND EXISTS ${CMAKE_SOURCE_DIR}/lib/fribidi)
98 --prefix ${_dst} 99 --prefix ${_dst}
99 BUILD_COMMAND ${NINJA_EXECUTABLE} 100 BUILD_COMMAND ${NINJA_EXECUTABLE}
100 INSTALL_COMMAND ${NINJA_EXECUTABLE} install 101 INSTALL_COMMAND ${NINJA_EXECUTABLE} install
102 STEP_TARGETS install
101 BUILD_BYPRODUCTS ${_dst}/lib/libfribidi.a 103 BUILD_BYPRODUCTS ${_dst}/lib/libfribidi.a
102 ) 104 )
103 else () 105 else ()
@@ -105,7 +107,7 @@ if (ENABLE_FRIBIDI AND EXISTS ${CMAKE_SOURCE_DIR}/lib/fribidi)
105 "GNU FriBidi must be built with Meson. Please install Meson and Ninja and try again, or provide FriBidi via pkg-config.") 107 "GNU FriBidi must be built with Meson. Please install Meson and Ninja and try again, or provide FriBidi via pkg-config.")
106 endif () 108 endif ()
107 add_library (fribidi-lib INTERFACE) 109 add_library (fribidi-lib INTERFACE)
108 add_dependencies (fribidi-lib fribidi-ext) 110 add_dependencies (fribidi-lib fribidi-install fribidi-ext)
109 target_include_directories (fribidi-lib INTERFACE ${_dst}/include) 111 target_include_directories (fribidi-lib INTERFACE ${_dst}/include)
110 target_link_libraries (fribidi-lib INTERFACE ${_dst}/lib/libfribidi.a) 112 target_link_libraries (fribidi-lib INTERFACE ${_dst}/lib/libfribidi.a)
111 set (FRIBIDI_FOUND YES) 113 set (FRIBIDI_FOUND YES)