2 files changed, 26 insertions, 1 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b62517c9..2621dc10 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,6 +30,7 @@ endif ()
 
 # Build configuration.
 option (ENABLE_HARFBUZZ         "Use HarfBuzz to shape text" ON)
+option (ENABLE_FRIBIDI          "Use FriBidi for bidirectional text" ON)
 option (ENABLE_IPC              "Use IPC to communicate between running instances" ON)
 option (ENABLE_MPG123           "Use mpg123 for decoding MPEG audio" ON)
 option (ENABLE_X11_SWRENDER     "Use software rendering under X11" OFF)
@@ -319,6 +320,10 @@ if (ENABLE_HARFBUZZ AND HARFBUZZ_FOUND)
     endif ()
     target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_HARFBUZZ=1)
 endif ()
+if (ENABLE_FRIBIDI AND FRIBIDI_FOUND)
+    target_link_libraries (app PUBLIC fribidi-lib)
+    target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_FRIBIDI=1)
+endif ()
 if (APPLE)
     if (IOS)
         target_link_libraries (app PUBLIC "-framework UIKit")
diff --git a/Depends.cmake b/Depends.cmake
index f543f576..002022ed 100644
--- a/Depends.cmake
+++ b/Depends.cmake
@@ -3,7 +3,7 @@ if (IOS)
     return ()
 endif ()
 
-if (ENABLE_HARFBUZZ AND EXISTS ${CMAKE_SOURCE_DIR}/lib/harfbuzz)
+if (ENABLE_HARFBUZZ AND EXISTS ${CMAKE_SOURCE_DIR}/lib/harfbuzz/CMakeLists.txt)
     # Build HarfBuzz with minimal dependencies.
     set (HB_BUILD_SUBSET  OFF CACHE BOOL "" FORCE)
     set (HB_HAVE_CORETEXT OFF CACHE BOOL "" FORCE)
@@ -11,10 +11,30 @@ if (ENABLE_HARFBUZZ AND EXISTS ${CMAKE_SOURCE_DIR}/lib/harfbuzz)
     set (HB_HAVE_GLIB     OFF CACHE BOOL "" FORCE)
     set (HB_HAVE_GOBJECT  OFF CACHE BOOL "" FORCE)
     set (HB_HAVE_ICU      OFF CACHE BOOL "" FORCE)
+    cmake_policy (SET CMP0075 NEW) 
     add_subdirectory (${CMAKE_SOURCE_DIR}/lib/harfbuzz)
     set (HARFBUZZ_FOUND YES)
 endif ()
 
+if (ENABLE_FRIBIDI AND EXISTS ${CMAKE_SOURCE_DIR}/lib/fribidi)
+    # Build FriBidi with Meson.
+    include (ExternalProject)
+    set (_dst ${CMAKE_BINARY_DIR}/lib/fribidi)
+    ExternalProject_Add (fribidi
+        PREFIX              ${CMAKE_BINARY_DIR}/fribidi-ext
+        SOURCE_DIR          ${CMAKE_SOURCE_DIR}/lib/fribidi
+        CONFIGURE_COMMAND   meson ${CMAKE_SOURCE_DIR}/lib/fribidi 
+                                -Dtests=false -Ddocs=false -Dbin=false
+                                --prefix ${_dst}
+        BUILD_COMMAND       ninja
+        INSTALL_COMMAND     ninja install
+    )
+    add_library (fribidi-lib INTERFACE)
+    target_include_directories (fribidi-lib INTERFACE ${_dst}/include)
+    target_link_libraries (fribidi-lib INTERFACE -L${_dst}/lib fribidi)
+    set (FRIBIDI_FOUND YES)
+endif ()
+
 if (NOT EXISTS ${CMAKE_SOURCE_DIR}/lib/the_Foundation/CMakeLists.txt)
     set (INSTALL_THE_FOUNDATION YES)
     find_package (the_Foundation REQUIRED)