Fixed: Compilation with freetype under Linux
This commit is contained in:
parent
9b058de0e6
commit
cb5a600578
1 changed files with 23 additions and 4 deletions
|
@ -9,7 +9,25 @@ IF(FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIRS)
|
||||||
SET(Freetype_FIND_QUIETLY TRUE)
|
SET(Freetype_FIND_QUIETLY TRUE)
|
||||||
ENDIF(FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIRS)
|
ENDIF(FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIRS)
|
||||||
|
|
||||||
FIND_PATH(FREETYPE_INCLUDE_DIR
|
FIND_PATH(FREETYPE_INCLUDE_DIRS
|
||||||
|
freetype
|
||||||
|
PATHS
|
||||||
|
$ENV{FREETYPE_DIR}/include
|
||||||
|
/usr/local/include
|
||||||
|
/usr/include
|
||||||
|
/sw/include
|
||||||
|
/opt/local/include
|
||||||
|
/opt/csw/include
|
||||||
|
/opt/include
|
||||||
|
PATH_SUFFIXES freetype2
|
||||||
|
)
|
||||||
|
|
||||||
|
IF(NOT FREETYPE_INCLUDE_DIRS)
|
||||||
|
SET(FREETYPE_INCLUDE_DIRS "")
|
||||||
|
ENDIF(NOT FREETYPE_INCLUDE_DIRS)
|
||||||
|
|
||||||
|
# ft2build.h does not reside in the freetype include dir
|
||||||
|
FIND_PATH(FREETYPE_ADDITIONAL_INCLUDE_DIR
|
||||||
ft2build.h
|
ft2build.h
|
||||||
PATHS
|
PATHS
|
||||||
/usr/local/include
|
/usr/local/include
|
||||||
|
@ -21,9 +39,10 @@ FIND_PATH(FREETYPE_INCLUDE_DIR
|
||||||
PATH_SUFFIXES freetype2
|
PATH_SUFFIXES freetype2
|
||||||
)
|
)
|
||||||
|
|
||||||
IF(FREETYPE_INCLUDE_DIR)
|
# combine both include directories into one variable
|
||||||
SET(FREETYPE_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIR})
|
IF(FREETYPE_ADDITIONAL_INCLUDE_DIR)
|
||||||
ENDIF(FREETYPE_INCLUDE_DIR)
|
SET(FREETYPE_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS} ${FREETYPE_ADDITIONAL_INCLUDE_DIR})
|
||||||
|
ENDIF(FREETYPE_ADDITIONAL_INCLUDE_DIR)
|
||||||
|
|
||||||
FIND_LIBRARY(FREETYPE_LIBRARY_RELEASE
|
FIND_LIBRARY(FREETYPE_LIBRARY_RELEASE
|
||||||
NAMES freetype libfreetype freetype219 freetype246
|
NAMES freetype libfreetype freetype219 freetype246
|
||||||
|
|
Loading…
Reference in a new issue