summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt7
-rw-r--r--Depends.cmake3
2 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7095173e..e7fe35a7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -327,7 +327,12 @@ if (ENABLE_HARFBUZZ AND HARFBUZZ_FOUND)
327 target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_HARFBUZZ=1) 327 target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_HARFBUZZ=1)
328endif () 328endif ()
329if (ENABLE_FRIBIDI AND FRIBIDI_FOUND) 329if (ENABLE_FRIBIDI AND FRIBIDI_FOUND)
330 target_link_libraries (app PUBLIC fribidi-lib) 330 if (TARGET fribidi-lib)
331 target_link_libraries (app PUBLIC fribidi-lib)
332 else ()
333 target_link_libraries (app PUBLIC ${FRIBIDI_LIBRARIES})
334 target_include_directories (app PUBLIC ${FRIBIDI_INCLUDE_DIRS})
335 endif ()
331 target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_FRIBIDI=1) 336 target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_FRIBIDI=1)
332endif () 337endif ()
333if (APPLE) 338if (APPLE)
diff --git a/Depends.cmake b/Depends.cmake
index 994e1b1c..50292eaf 100644
--- a/Depends.cmake
+++ b/Depends.cmake
@@ -76,9 +76,6 @@ if (ENABLE_FRIBIDI AND EXISTS ${CMAKE_SOURCE_DIR}/lib/fribidi)
76 # Find FriBidi with pkg-config. 76 # Find FriBidi with pkg-config.
77 if (NOT ENABLE_FRIBIDI_BUILD AND PKG_CONFIG_FOUND) 77 if (NOT ENABLE_FRIBIDI_BUILD AND PKG_CONFIG_FOUND)
78 pkg_check_modules (FRIBIDI IMPORTED_TARGET fribidi) 78 pkg_check_modules (FRIBIDI IMPORTED_TARGET fribidi)
79 if (FRIBIDI_FOUND)
80 add_library (fribidi-lib ALIAS PkgConfig::FRIBIDI)
81 endif ()
82 endif () 79 endif ()
83 if (ENABLE_FRIBIDI_BUILD OR NOT FRIBIDI_FOUND) 80 if (ENABLE_FRIBIDI_BUILD OR NOT FRIBIDI_FOUND)
84 # Build FriBidi with Meson. 81 # Build FriBidi with Meson.