0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cmake: Fix regression in FindFriBiDi, take 2

Browse source 
Applying commit fb01510726 doesn't fix
this for Ivanovic, so I'm reverting both that and the original commit
651344ee1b.
This commit is contained in:
Ignacio R. Morelle 2015-04-10 18:27:06 -03:00
parent f14341ce59
commit bf8185390f
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmake/FindFriBiDi.cmake
View file

@ -19,13 +19,15 @@ SET(FRIBIDI_FOUND "NO")
# Set variable in temp var, otherwise FIND_PATH might fail
# unset isn't present in the required version of cmake.
FIND_PATH(xFRIBIDI_INCLUDE_DIR fribidi.h
PATH_SUFFIXES fribidi
/usr/local/include/fribidi
/usr/include/fribidi
)
set(FRIBIDI_INCLUDE_DIR ${xFRIBIDI_INCLUDE_DIR})
SET(FRIBIDI_NAMES ${FRIBIDI_NAMES} fribidi libfribidi)
FIND_LIBRARY(FRIBIDI_LIBRARY
NAMES ${FRIBIDI_NAMES}
PATHS /usr/lib /usr/local/lib
)
IF (FRIBIDI_LIBRARY AND FRIBIDI_INCLUDE_DIR)