Strip trailing whitespace

Alex
This commit is contained in:
Alex Neundorf 2011-07-27 20:32:59 +02:00
parent 49a00ec2de
commit 7c38523470
2 changed files with 12 additions and 12 deletions

View File

@ -24,24 +24,24 @@
# (To distribute this file outside of CMake, substitute the full # (To distribute this file outside of CMake, substitute the full
# License text for the above reference.) # License text for the above reference.)
# Created by Eric Wing. # Created by Eric Wing.
# Modifications by Alexander Neundorf. # Modifications by Alexander Neundorf.
# This file has been renamed to "FindFreetype.cmake" instead of the correct # 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. # "FindFreeType.cmake" in order to be compatible with the one from KDE4, Alex.
# Ugh, FreeType seems to use some #include trickery which # Ugh, FreeType seems to use some #include trickery which
# makes this harder than it should be. It looks like they # makes this harder than it should be. It looks like they
# put ft2build.h in a common/easier-to-find location which # put ft2build.h in a common/easier-to-find location which
# then contains a #include to a more specific header in a # then contains a #include to a more specific header in a
# more specific location (#include <freetype/config/ftheader.h>). # more specific location (#include <freetype/config/ftheader.h>).
# Then from there, they need to set a bunch of #define's # Then from there, they need to set a bunch of #define's
# so you can do something like: # so you can do something like:
# #include FT_FREETYPE_H # #include FT_FREETYPE_H
# Unfortunately, using CMake's mechanisms like INCLUDE_DIRECTORIES() # Unfortunately, using CMake's mechanisms like INCLUDE_DIRECTORIES()
# wants explicit full paths and this trickery doesn't work too well. # wants explicit full paths and this trickery doesn't work too well.
# I'm going to attempt to cut out the middleman and hope # I'm going to attempt to cut out the middleman and hope
# everything still works. # everything still works.
FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
HINTS HINTS
$ENV{FREETYPE_DIR} $ENV{FREETYPE_DIR}
PATH_SUFFIXES include PATH_SUFFIXES include
@ -54,7 +54,7 @@ FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
/usr/freeware/include /usr/freeware/include
) )
FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
HINTS HINTS
$ENV{FREETYPE_DIR}/include/freetype2 $ENV{FREETYPE_DIR}/include/freetype2
PATHS PATHS
@ -86,7 +86,7 @@ IF(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
ENDIF(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2) ENDIF(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
SET(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}") SET(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}")
# handle the QUIETLY and REQUIRED arguments and set FREETYPE_FOUND to TRUE if # handle the QUIETLY and REQUIRED arguments and set FREETYPE_FOUND to TRUE if
# all listed variables are TRUE # all listed variables are TRUE
INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Freetype DEFAULT_MSG FREETYPE_LIBRARY FREETYPE_INCLUDE_DIRS) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Freetype DEFAULT_MSG FREETYPE_LIBRARY FREETYPE_INCLUDE_DIRS)

View File

@ -1,6 +1,6 @@
# This module defines # This module defines
# GIF_LIBRARIES - libraries to link to in order to use GIF # GIF_LIBRARIES - libraries to link to in order to use GIF
# GIF_FOUND, if false, do not try to link # GIF_FOUND, if false, do not try to link
# GIF_INCLUDE_DIR, where to find the headers # GIF_INCLUDE_DIR, where to find the headers
# #
# $GIF_DIR is an environment variable that would # $GIF_DIR is an environment variable that would
@ -19,7 +19,7 @@
# (To distribute this file outside of CMake, substitute the full # (To distribute this file outside of CMake, substitute the full
# License text for the above reference.) # License text for the above reference.)
# Created by Eric Wing. # Created by Eric Wing.
# Modifications by Alexander Neundorf # Modifications by Alexander Neundorf
FIND_PATH(GIF_INCLUDE_DIR gif_lib.h FIND_PATH(GIF_INCLUDE_DIR gif_lib.h
@ -37,7 +37,7 @@ FIND_PATH(GIF_INCLUDE_DIR gif_lib.h
# the gif library can have many names :-/ # the gif library can have many names :-/
SET(POTENTIAL_GIF_LIBS gif libgif ungif libungif giflib) SET(POTENTIAL_GIF_LIBS gif libgif ungif libungif giflib)
FIND_LIBRARY(GIF_LIBRARY FIND_LIBRARY(GIF_LIBRARY
NAMES ${POTENTIAL_GIF_LIBS} NAMES ${POTENTIAL_GIF_LIBS}
HINTS HINTS
$ENV{GIF_DIR} $ENV{GIF_DIR}
@ -58,7 +58,7 @@ FIND_LIBRARY(GIF_LIBRARY
# see readme.txt # see readme.txt
SET(GIF_LIBRARIES ${GIF_LIBRARY}) SET(GIF_LIBRARIES ${GIF_LIBRARY})
# handle the QUIETLY and REQUIRED arguments and set GIF_FOUND to TRUE if # handle the QUIETLY and REQUIRED arguments and set GIF_FOUND to TRUE if
# all listed variables are TRUE # all listed variables are TRUE
INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GIF DEFAULT_MSG GIF_LIBRARY GIF_INCLUDE_DIR) FIND_PACKAGE_HANDLE_STANDARD_ARGS(GIF DEFAULT_MSG GIF_LIBRARY GIF_INCLUDE_DIR)