diff options
author | Alexander Neundorf <neundorf@kde.org> | 2008-01-04 17:38:34 (GMT) |
---|---|---|
committer | Alexander Neundorf <neundorf@kde.org> | 2008-01-04 17:38:34 (GMT) |
commit | eed9b1b0dac484eea807ac3bb07051b69b94af6b (patch) | |
tree | 890e954b2367651526f8fac7a37e54667c140a5d /Modules/FindFreetype.cmake | |
parent | daa45056c9bf4593662a0beb0b601cf78ba29d1b (diff) | |
download | CMake-eed9b1b0dac484eea807ac3bb07051b69b94af6b.zip CMake-eed9b1b0dac484eea807ac3bb07051b69b94af6b.tar.gz CMake-eed9b1b0dac484eea807ac3bb07051b69b94af6b.tar.bz2 |
ENH: rename variables from GIFLIB_* to GIF_*
-add standard QUIET and REQUIRED handling
-add GIF_LIBRARIES variable as readme.txt says
-add name giflib to the names for the gif library
-remove some unnecessary search paths for the lib (they are already part of
the standard search paths, see Modules/Platform/UnixPaths.cmake)
-FindFreetype.cmake: use PATH_SUFFIXES include again for the headers with
the CMAKE_PREFIX_PATH variable
Alex
Diffstat (limited to 'Modules/FindFreetype.cmake')
-rw-r--r-- | Modules/FindFreetype.cmake | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake index c37fce1..0639cdd 100644 --- a/Modules/FindFreetype.cmake +++ b/Modules/FindFreetype.cmake @@ -10,7 +10,11 @@ # $FREETYPE_DIR is an environment variable that would # correspond to the ./configure --prefix=$FREETYPE_DIR # used in building FREETYPE. + # Created by Eric Wing. +# Modifications by Alexander Neundorf. +# This file has been renamed to "FindFreetype.cmake" instead of the correct +# "FindFreeType.cmake" in order to be compatible with the one from KDE4, Alex. # Ugh, FreeType seems to use some #include trickery which # makes this harder than it should be. It looks like they @@ -27,11 +31,12 @@ FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h $ENV{FREETYPE_DIR} NO_DEFAULT_PATH - PATH_SUFFIXES include + PATH_SUFFIXES include ) FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h - PATHS ${CMAKE_PREFIX_PATH}/include # Unofficial: We are proposing this. + PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this. NO_DEFAULT_PATH + PATH_SUFFIXES include ) FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h @@ -49,9 +54,9 @@ FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h NO_DEFAULT_PATH ) FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h - PATHS ${CMAKE_PREFIX_PATH}/include # Unofficial: We are proposing this. + PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this. NO_DEFAULT_PATH - PATH_SUFFIXES freetype2 + PATH_SUFFIXES include/freetype2 ) FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h /usr/local/X11R6/include @@ -79,16 +84,10 @@ FIND_LIBRARY(FREETYPE_LIBRARY FIND_LIBRARY(FREETYPE_LIBRARY NAMES freetype libfreetype freetype219 PATHS - /usr/local - /usr /usr/local/X11R6 /usr/local/X11 - /usr/X11R6 /usr/X11 /sw - /opt/local - /opt/csw - /opt /usr/freeware PATH_SUFFIXES lib64 lib ) @@ -99,7 +98,7 @@ IF(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2) ENDIF(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2) SET(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}") -# handle the QUIETLY and REQUIRED arguments and set PERLLIBS_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set FREETYPE_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Freetype DEFAULT_MSG FREETYPE_LIBRARY FREETYPE_INCLUDE_DIRS) |