Advertisement
sbir

fribidi.patch

Mar 20th, 2014
109
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 2.27 KB | None | 0 0
  1. diff -Naur 3/M.A.R.S./cmake/modules/FindFribidi.cmake 4/M.A.R.S./cmake/modules/FindFribidi.cmake
  2. --- 3/M.A.R.S./cmake/modules/FindFribidi.cmake  1970-01-01 03:00:00.000000000 +0300
  3. +++ 4/M.A.R.S./cmake/modules/FindFribidi.cmake  2014-03-20 19:05:02.840888000 +0400
  4. @@ -0,0 +1,42 @@
  5. +# - Find Fribidi
  6. +# Find the Fribidi includes and libraries
  7. +#
  8. +# Following variables are provided:
  9. +# FRIBIDI_FOUND
  10. +#     True if Fribidi has been found
  11. +# FRIBIDI_INCLUDE_DIRS
  12. +#     The include directories of Fribidi
  13. +# FRIBIDI_LIBRARIES
  14. +#     Fribidi library list
  15. +
  16. +if(APPLE)
  17. +    set(FRIBIDI_INCLUDE_DIR NAMES fribidi/fribidi.h PATHS /Library/Frameworks/fribidi.framework/Headers)
  18. +    find_library(FRIBIDI_LIBRARY NAMES fribidi PATHS /Library/Frameworks/fribidi.framework)
  19. +    set(FRIBIDI_LIBRARIES ${FRIBIDI_LIBRARY})
  20. +    include_directories(/Library/Frameworks/fribidi.framework/Headers)
  21. +    #add_definitions(-framework fribidi)
  22. +    set(FRIBIDI_FOUND 1)
  23. +elseif(UNIX)
  24. +    include(FindPkgConfig)
  25. +    pkg_check_modules(FRIBIDI fribidi)
  26. +else()
  27. +    set(FRIBIDI_FOUND 0)
  28. +endif()
  29. +
  30. +if(NOT FRIBIDI_FOUND)
  31. +    find_path(FRIBIDI_INCLUDE_DIR NAMES fribidi/fribidi.h PATHS /Library/Frameworks/fribidi.framework/Headers "${PROJECT_SOURCE_DIR}/dependencies/include")
  32. +    find_library(FRIBIDI_LIBRARY NAMES fribidi PATHS /Library/Frameworks/fribidi.framework "${PROJECT_SOURCE_DIR}/dependencies/lib")
  33. +
  34. +    include(FindPackageHandleStandardArgs)
  35. +    find_package_handle_standard_args(Fribidi DEFAULT_MSG FRIBIDI_INCLUDE_DIR FRIBIDI_LIBRARY)
  36. +
  37. +    if(APPLE)
  38. +            set(FRIBIDI_INCLUDE_DIR "/Library/Frameworks/fribidi.framework/Headers")
  39. +    endif()
  40. +
  41. +    # Publish variables
  42. +    set(FRIBIDI_INCLUDE_DIRS ${FRIBIDI_INCLUDE_DIR})
  43. +    set(FRIBIDI_LIBRARIES ${FRIBIDI_LIBRARY})
  44. +endif()
  45. +
  46. +mark_as_advanced(FRIBIDI_INCLUDE_DIR FRIBIDI_LIBRARY)
  47. diff -Naur 3/M.A.R.S./CMakeLists.txt 4/M.A.R.S./CMakeLists.txt
  48. --- 3/M.A.R.S./CMakeLists.txt   2014-03-20 18:17:59.360909000 +0400
  49. +++ 4/M.A.R.S./CMakeLists.txt   2014-03-20 19:09:59.824219000 +0400
  50. @@ -47,6 +47,8 @@
  51.  
  52.  # Fribidi library needed for bi-directional texts
  53.     find_library(FRIBIDI_LIBRARY fribidi)
  54. +   find_package( Fribidi )
  55. +   include_directories(${FRIBIDI_INCLUDE_DIRS})
  56.  
  57.  # set the executable output path
  58.  if(APPLE)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement