sync with upstream

1 files changed, 37 insertions, 11 deletions

diff --git a/project/cmake/modules/FindFribidi.cmake b/project/cmake/modules/FindFribidi.cmake
index 65a8d8b..03c2f53 100644
--- a/project/cmake/modules/FindFribidi.cmake
+++ b/project/cmake/modules/FindFribidi.cmake
@@ -1,18 +1,44 @@
-# - Try to find Fribidi
-# Once done this will define
+#.rst:
+# FindFribidi
+# -----------
+# Finds the GNU FriBidi library
 #
-# FRIBIDI_FOUND - system has fribidi
-# FRIBIDI_INCLUDE_DIRS - the fribidi include directory
-# FRIBIDI_LIBRARIES - The fribidi libraries
+# This will will define the following variables::
+#
+# FRIBIDI_FOUND - system has FriBidi
+# FRIBIDI_INCLUDE_DIRS - the FriBidi include directory
+# FRIBIDI_LIBRARIES - the FriBidi libraries
+#
+# and the following imported targets::
+#
+#   FriBidi::FriBidi   - The FriBidi library
 
 if(PKG_CONFIG_FOUND)
-  pkg_check_modules (FRIBIDI fribidi)
-else()
-  find_path(FRIBIDI_INCLUDE_DIRS fribidi/fribidi.h)
-  find_library(FRIBIDI_LIBRARIES NAMES fribidi libfribidi)
+  pkg_check_modules(PC_FRIBIDI fribidi QUIET)
 endif()
 
+find_path(FRIBIDI_INCLUDE_DIR NAMES fribidi/fribidi.h
+                              PATHS ${PC_FRIBIDI_INCLUDEDIR})
+find_library(FRIBIDI_LIBRARY NAMES fribidi libfribidi
+                             PATHS ${PC_FRIBIDI_LIBDIR})
+
+set(FRIBIDI_VERSION ${PC_FRIBIDI_VERSION})
+
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Fribidi DEFAULT_MSG FRIBIDI_INCLUDE_DIRS FRIBIDI_LIBRARIES)
+find_package_handle_standard_args(FriBidi
+                                  REQUIRED_VARS FRIBIDI_LIBRARY FRIBIDI_INCLUDE_DIR
+                                  VERSION_VAR FRIBIDI_VERSION)
+
+if(FRIBIDI_FOUND)
+  set(FRIBIDI_LIBRARIES ${FRIBIDI_LIBRARY})
+  set(FRIBIDI_INCLUDE_DIRS ${FRIBIDI_INCLUDE_DIR})
+
+  if(NOT TARGET FriBidi::FriBidi)
+    add_library(FriBidi::FriBidi UNKNOWN IMPORTED)
+    set_target_properties(FriBidi::FriBidi PROPERTIES
+                                           IMPORTED_LOCATION "${FRIBIDI_LIBRARY}"
+                                           INTERFACE_INCLUDE_DIRECTORIES "${FRIBIDI_INCLUDE_DIR}")
+  endif()
+endif()
 
-mark_as_advanced(FRIBIDI_INCLUDE_DIRS FRIBIDI_LIBRARIES)
+mark_as_advanced(FRIBIDI_INCLUDE_DIR FRIBIDI_LIBRARY)