Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -Naur 3/M.A.R.S./cmake/modules/FindFribidi.cmake 4/M.A.R.S./cmake/modules/FindFribidi.cmake
- --- 3/M.A.R.S./cmake/modules/FindFribidi.cmake 1970-01-01 03:00:00.000000000 +0300
- +++ 4/M.A.R.S./cmake/modules/FindFribidi.cmake 2014-03-20 19:05:02.840888000 +0400
- @@ -0,0 +1,42 @@
- +# - Find Fribidi
- +# Find the Fribidi includes and libraries
- +#
- +# Following variables are provided:
- +# FRIBIDI_FOUND
- +# True if Fribidi has been found
- +# FRIBIDI_INCLUDE_DIRS
- +# The include directories of Fribidi
- +# FRIBIDI_LIBRARIES
- +# Fribidi library list
- +
- +if(APPLE)
- + set(FRIBIDI_INCLUDE_DIR NAMES fribidi/fribidi.h PATHS /Library/Frameworks/fribidi.framework/Headers)
- + find_library(FRIBIDI_LIBRARY NAMES fribidi PATHS /Library/Frameworks/fribidi.framework)
- + set(FRIBIDI_LIBRARIES ${FRIBIDI_LIBRARY})
- + include_directories(/Library/Frameworks/fribidi.framework/Headers)
- + #add_definitions(-framework fribidi)
- + set(FRIBIDI_FOUND 1)
- +elseif(UNIX)
- + include(FindPkgConfig)
- + pkg_check_modules(FRIBIDI fribidi)
- +else()
- + set(FRIBIDI_FOUND 0)
- +endif()
- +
- +if(NOT FRIBIDI_FOUND)
- + find_path(FRIBIDI_INCLUDE_DIR NAMES fribidi/fribidi.h PATHS /Library/Frameworks/fribidi.framework/Headers "${PROJECT_SOURCE_DIR}/dependencies/include")
- + find_library(FRIBIDI_LIBRARY NAMES fribidi PATHS /Library/Frameworks/fribidi.framework "${PROJECT_SOURCE_DIR}/dependencies/lib")
- +
- + include(FindPackageHandleStandardArgs)
- + find_package_handle_standard_args(Fribidi DEFAULT_MSG FRIBIDI_INCLUDE_DIR FRIBIDI_LIBRARY)
- +
- + if(APPLE)
- + set(FRIBIDI_INCLUDE_DIR "/Library/Frameworks/fribidi.framework/Headers")
- + endif()
- +
- + # Publish variables
- + set(FRIBIDI_INCLUDE_DIRS ${FRIBIDI_INCLUDE_DIR})
- + set(FRIBIDI_LIBRARIES ${FRIBIDI_LIBRARY})
- +endif()
- +
- +mark_as_advanced(FRIBIDI_INCLUDE_DIR FRIBIDI_LIBRARY)
- diff -Naur 3/M.A.R.S./CMakeLists.txt 4/M.A.R.S./CMakeLists.txt
- --- 3/M.A.R.S./CMakeLists.txt 2014-03-20 18:17:59.360909000 +0400
- +++ 4/M.A.R.S./CMakeLists.txt 2014-03-20 19:09:59.824219000 +0400
- @@ -47,6 +47,8 @@
- # Fribidi library needed for bi-directional texts
- find_library(FRIBIDI_LIBRARY fribidi)
- + find_package( Fribidi )
- + include_directories(${FRIBIDI_INCLUDE_DIRS})
- # set the executable output path
- if(APPLE)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement