From 5c5753682b3ac2a4b865704251adc232a22149ff Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 1 Jun 2016 15:09:21 +0100 Subject: [PATCH] Fixed line endings --- CMakeModules/FindFreetype.cmake | 38 ++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/CMakeModules/FindFreetype.cmake b/CMakeModules/FindFreetype.cmake index 86c4a1c4f..774a0ec04 100644 --- a/CMakeModules/FindFreetype.cmake +++ b/CMakeModules/FindFreetype.cmake @@ -6,11 +6,11 @@ # This is the concatenation of the paths: # FREETYPE_INCLUDE_DIR_ft2build # FREETYPE_INCLUDE_DIR_freetype2 -# +# # $FREETYPE_DIR is an environment variable that would # correspond to the ./configure --prefix=$FREETYPE_DIR # used in building FREETYPE. -# Created by Eric Wing. +# Created by Eric Wing. # prefer FindFreetype from cmake distribution if(EXISTS ${CMAKE_ROOT}/Modules/FindFreetype.cmake) @@ -21,31 +21,31 @@ if(EXISTS ${CMAKE_ROOT}/Modules/FindFreetype.cmake) endif() endif() -# 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 # 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 ). -# 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: # #include FT_FREETYPE_H # Unfortunately, using CMake's mechanisms like INCLUDE_DIRECTORIES() # 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. -FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h +FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h PATHS $ENV{FREETYPE_DIR} NO_DEFAULT_PATH - PATH_SUFFIXES include + PATH_SUFFIXES include ) -FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h +FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this. NO_DEFAULT_PATH PATH_SUFFIXES include ) -FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h +FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h PATHS /usr/local /usr @@ -61,16 +61,16 @@ FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h PATH_SUFFIXES include include/freetype2 ) -FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h +FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h $ENV{FREETYPE_DIR}/include/freetype2 NO_DEFAULT_PATH ) -FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h +FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this. NO_DEFAULT_PATH PATH_SUFFIXES include/freetype2 ) -FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h +FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h /usr/local/include/freetype2 /usr/include/freetype2 /usr/local/X11R6/include/freetype2 @@ -84,7 +84,7 @@ FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h /usr/freeware/include/freetype2 ) -FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h +FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h /usr/local/include/freetype2 /usr/include/freetype2 /usr/local/X11R6/include/freetype2 @@ -98,20 +98,20 @@ FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h /usr/freeware/include/freetype2 ) -FIND_LIBRARY(FREETYPE_LIBRARY +FIND_LIBRARY(FREETYPE_LIBRARY NAMES freetype libfreetype freetype219 PATHS $ENV{FREETYPE_DIR} NO_DEFAULT_PATH - PATH_SUFFIXES lib64 lib + PATH_SUFFIXES lib64 lib ) -FIND_LIBRARY(FREETYPE_LIBRARY +FIND_LIBRARY(FREETYPE_LIBRARY NAMES freetype libfreetype freetype219 PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this. NO_DEFAULT_PATH - PATH_SUFFIXES lib64 lib + PATH_SUFFIXES lib64 lib ) -FIND_LIBRARY(FREETYPE_LIBRARY +FIND_LIBRARY(FREETYPE_LIBRARY NAMES freetype libfreetype freetype219 PATHS /usr/local