From 7c3852347082a4a0fbeab747d0ec975b72a13c27 Mon Sep 17 00:00:00 2001 From: Alex Neundorf Date: Wed, 27 Jul 2011 20:32:59 +0200 Subject: [PATCH 1/4] Strip trailing whitespace Alex --- Modules/FindFreetype.cmake | 16 ++++++++-------- Modules/FindGIF.cmake | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake index 8957b6484..d6cac755a 100644 --- a/Modules/FindFreetype.cmake +++ b/Modules/FindFreetype.cmake @@ -24,24 +24,24 @@ # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) -# Created by Eric Wing. +# 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 +# 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 HINTS $ENV{FREETYPE_DIR} PATH_SUFFIXES include @@ -54,7 +54,7 @@ FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h /usr/freeware/include ) -FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h +FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h HINTS $ENV{FREETYPE_DIR}/include/freetype2 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) 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 INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Freetype DEFAULT_MSG FREETYPE_LIBRARY FREETYPE_INCLUDE_DIRS) diff --git a/Modules/FindGIF.cmake b/Modules/FindGIF.cmake index 1fad07ddd..43802ccb1 100644 --- a/Modules/FindGIF.cmake +++ b/Modules/FindGIF.cmake @@ -1,6 +1,6 @@ # This module defines # 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_DIR is an environment variable that would @@ -19,7 +19,7 @@ # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) -# Created by Eric Wing. +# Created by Eric Wing. # Modifications by Alexander Neundorf 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 :-/ SET(POTENTIAL_GIF_LIBS gif libgif ungif libungif giflib) -FIND_LIBRARY(GIF_LIBRARY +FIND_LIBRARY(GIF_LIBRARY NAMES ${POTENTIAL_GIF_LIBS} HINTS $ENV{GIF_DIR} @@ -58,7 +58,7 @@ FIND_LIBRARY(GIF_LIBRARY # see readme.txt 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 INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(GIF DEFAULT_MSG GIF_LIBRARY GIF_INCLUDE_DIR) From f97620e733a0939046b5b098da3451b20fd26c96 Mon Sep 17 00:00:00 2001 From: Alex Neundorf Date: Wed, 27 Jul 2011 20:34:09 +0200 Subject: [PATCH 2/4] FindGIF/FindFreetype.cmake: remove standard search paths from find-calls In both files find_path() and find_library() are called with multiple additional search PATHS which are already anyway part of the default search dirs, so it should be safe to remove them. Alex --- Modules/FindFreetype.cmake | 9 --------- Modules/FindGIF.cmake | 13 +------------ 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake index d6cac755a..6251805df 100644 --- a/Modules/FindFreetype.cmake +++ b/Modules/FindFreetype.cmake @@ -44,13 +44,9 @@ FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h HINTS $ENV{FREETYPE_DIR} - PATH_SUFFIXES include PATHS /usr/local/X11R6/include /usr/local/X11/include - /usr/X11/include - /sw/include - /opt/local/include /usr/freeware/include ) @@ -60,9 +56,6 @@ FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h PATHS /usr/local/X11R6/include /usr/local/X11/include - /usr/X11/include - /sw/include - /opt/local/include /usr/freeware/include PATH_SUFFIXES freetype2 ) @@ -75,8 +68,6 @@ FIND_LIBRARY(FREETYPE_LIBRARY PATHS /usr/local/X11R6 /usr/local/X11 - /usr/X11 - /sw /usr/freeware ) diff --git a/Modules/FindGIF.cmake b/Modules/FindGIF.cmake index 43802ccb1..01253466f 100644 --- a/Modules/FindGIF.cmake +++ b/Modules/FindGIF.cmake @@ -28,10 +28,7 @@ FIND_PATH(GIF_INCLUDE_DIR gif_lib.h PATH_SUFFIXES include PATHS ~/Library/Frameworks - /Library/Frameworks - /sw/include # Fink - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include - /usr/freeware/include + /usr/freeware ) # the gif library can have many names :-/ @@ -44,14 +41,6 @@ FIND_LIBRARY(GIF_LIBRARY PATH_SUFFIXES lib64 lib PATHS ~/Library/Frameworks - /Library/Frameworks - /usr/local - /usr - /sw - /opt/local - /opt/csw - /opt - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT] /usr/freeware ) From 2462f6508564a5e7b1a56255a480303f11e680b4 Mon Sep 17 00:00:00 2001 From: Alex Neundorf Date: Wed, 27 Jul 2011 20:40:39 +0200 Subject: [PATCH 3/4] FindGif: add giflib4 as one more name for the library under Windows Alex --- Modules/FindGIF.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/FindGIF.cmake b/Modules/FindGIF.cmake index 01253466f..8e2e43e32 100644 --- a/Modules/FindGIF.cmake +++ b/Modules/FindGIF.cmake @@ -32,7 +32,7 @@ FIND_PATH(GIF_INCLUDE_DIR gif_lib.h ) # 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 giflib4) FIND_LIBRARY(GIF_LIBRARY NAMES ${POTENTIAL_GIF_LIBS} From 81a70c6ad2b13b6a196330767316d1aac5d3ece6 Mon Sep 17 00:00:00 2001 From: Alex Neundorf Date: Tue, 2 Aug 2011 00:30:58 +0200 Subject: [PATCH 4/4] Add basic version check for giflib This is used e.g. in KDE, there on Solaris an old version of giflib was found (version 3), which could be detected by checking for the UserData member variable: http://websvn.kde.org/?view=revision&revision=545738 Alex --- Modules/FindGIF.cmake | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/Modules/FindGIF.cmake b/Modules/FindGIF.cmake index 8e2e43e32..41e909805 100644 --- a/Modules/FindGIF.cmake +++ b/Modules/FindGIF.cmake @@ -1,7 +1,11 @@ -# This module defines +# This module searches giflib and defines # GIF_LIBRARIES - libraries to link to in order to use GIF # GIF_FOUND, if false, do not try to link # GIF_INCLUDE_DIR, where to find the headers +# GIF_VERSION, reports either version 4 or 3 (for everything before version 4) +# +# The minimum required version of giflib can be specified using the +# standard syntax, e.g. FIND_PACKAGE(GIF 4) # # $GIF_DIR is an environment variable that would # correspond to the ./configure --prefix=$GIF_DIR @@ -47,9 +51,30 @@ FIND_LIBRARY(GIF_LIBRARY # see readme.txt SET(GIF_LIBRARIES ${GIF_LIBRARY}) +# Very basic version detection. +# The GIF_LIB_VERSION string in gif_lib.h seems to be unreliable, since it seems +# to be always " Version 2.0, " in versions 3.x of giflib. +# In version 4 the member UserData was added to GifFileType, so we check for this +# one. +# http://giflib.sourcearchive.com/documentation/4.1.4/files.html +IF(GIF_INCLUDE_DIR) + INCLUDE(CMakePushCheckState) + INCLUDE(CheckStructHasMember) + CMAKE_PUSH_CHECK_STATE() + SET(GIF_VERSION 3) + SET(CMAKE_REQUIRED_INCLUDES "${GIF_INCLUDE_DIR}") + CHECK_STRUCT_HAS_MEMBER(GifFileType UserData gif_lib.h GIF_GifFileType_UserData ) + IF(GIF_GifFileType_UserData) + SET(GIF_VERSION 4) + ENDIF() + CMAKE_POP_CHECK_STATE() +ENDIF() + + # handle the QUIETLY and REQUIRED arguments and set GIF_FOUND to TRUE if # all listed variables are TRUE 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 REQUIRED_VARS GIF_LIBRARY GIF_INCLUDE_DIR + VERSION_VAR GIF_VERSION ) MARK_AS_ADVANCED(GIF_INCLUDE_DIR GIF_LIBRARY)