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

(most likely) fix detecting fribidi as found...

Browse source 
...though the wrong version is found when using cmake, now, as in
autotools and scons build, only "version 1" is accepted
This commit is contained in:
Nils Kneuper 2009-03-03 00:04:00 +00:00
parent 39c1c5162d
commit b138311480
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -1,11 +1,5 @@
# most stuff should be implemented so far, mgoe should know the details (he has done all the work...)
# what is not working so far:
# * The fribidi check doesn't distinguish between version 1 and version 2
# Wesnoth only works with version 1 currently, so if version 2 is installed,
# it should be treated the same as if it wasn't present. (This should be fixed, please test)
# The fribidi test for fribidi_utf8_to_unicode succeeds when it shouldn't.
# I looked through the header files for that string and didn't find it,
# so I don't know why the test is succeeding.
# * some other smaller stuff
# * nice INSTALL howto
# * check for poll(2) and select(2) as in SConstruct line 183 and if found, define same
@ -62,7 +56,7 @@ set(LOCALEDIR "translations" CACHE STRING "change the name of the locale data di
set(PREFERENCES_DIR "" CACHE STRING "Use a non-default preferences directory (.wesnoth on unix)")
#Game options
option(ENABLE_FRIBIDI "Enable FriBIDi support" OFF)
option(ENABLE_FRIBIDI "Enable FriBIDi support" ON)
set(GUI "normal" CACHE STRING "Set for GUI reductions for resolutions down to 320x240 (PDAs) (normal|tiny)")
#server options

8
cmake/FindFriBiDi.cmake
View file

@ -1,6 +1,6 @@
# - Find the native FriBiDI includes and library
#
#
# This module defines
# FRIBIDI_INCLUDE_DIR, where to find fribidi.h, etc.
# FRIBIDI_LIBRARIES, the libraries to link against to use FriBiDi.
@ -9,7 +9,7 @@
# also defined, but not for general use are
# FRIBIDI_LIBRARY, where to find the FriBiDi library.
include(CheckFunctionExists)
include(CheckSymbolExists)
SET(FRIBIDI_FOUND "NO")
@ -27,7 +27,9 @@ FIND_LIBRARY(FRIBIDI_LIBRARY
IF (FRIBIDI_LIBRARY AND FRIBIDI_INCLUDE_DIR)
SET(CMAKE_REQUIRED_INCLUDES ${FRIBIDI_INCLUDE_DIR})
SET(CMAKE_REQUIRED_LIBRARIES ${FRIBIDI_LIBRARY})
CHECK_FUNCTION_EXISTS(fribidi_utf8_to_unicode FOUND_fribidi_utf8_to_unicode)
#we only support version 1 of fribidi and need the symbol fribidi_utf8_to_unicode
#here we check if it is really available
CHECK_SYMBOL_EXISTS(fribidi_utf8_to_unicode fribidi/fribidi.h FOUND_fribidi_utf8_to_unicode)
if(FOUND_fribidi_utf8_to_unicode)
SET(FRIBIDI_LIBRARIES ${FRIBIDI_LIBRARY})
SET(FRIBIDI_FOUND "YES")