[Cmake-commits] CMake branch, next, updated. v2.8.5-1382-gc91bef7
Alexander Neundorf
neundorf at kde.org
Mon Aug 1 18:35:43 EDT 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via c91bef714acbad0aca679cfeba2039d1e233c519 (commit)
via 81a70c6ad2b13b6a196330767316d1aac5d3ece6 (commit)
via 2462f6508564a5e7b1a56255a480303f11e680b4 (commit)
via f97620e733a0939046b5b098da3451b20fd26c96 (commit)
via 7c3852347082a4a0fbeab747d0ec975b72a13c27 (commit)
from a0adda06f86bab879f8fa4affc731cd5fd8d5ee7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c91bef714acbad0aca679cfeba2039d1e233c519
commit c91bef714acbad0aca679cfeba2039d1e233c519
Merge: a0adda0 81a70c6
Author: Alexander Neundorf <neundorf at kde.org>
AuthorDate: Mon Aug 1 18:35:40 2011 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 1 18:35:40 2011 -0400
Merge topic 'FindGIFAndFreetypeCleanupAndEnhancements' into next
81a70c6 Add basic version check for giflib
2462f65 FindGif: add giflib4 as one more name for the library under Windows
f97620e FindGIF/FindFreetype.cmake: remove standard search paths from find-calls
7c38523 Strip trailing whitespace
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=81a70c6ad2b13b6a196330767316d1aac5d3ece6
commit 81a70c6ad2b13b6a196330767316d1aac5d3ece6
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Aug 2 00:30:58 2011 +0200
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Aug 2 00:30:58 2011 +0200
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
diff --git a/Modules/FindGIF.cmake b/Modules/FindGIF.cmake
index 8e2e43e..41e9098 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)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2462f6508564a5e7b1a56255a480303f11e680b4
commit 2462f6508564a5e7b1a56255a480303f11e680b4
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Wed Jul 27 20:40:39 2011 +0200
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Wed Jul 27 20:40:39 2011 +0200
FindGif: add giflib4 as one more name for the library under Windows
Alex
diff --git a/Modules/FindGIF.cmake b/Modules/FindGIF.cmake
index 0125346..8e2e43e 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}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f97620e733a0939046b5b098da3451b20fd26c96
commit f97620e733a0939046b5b098da3451b20fd26c96
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Wed Jul 27 20:34:09 2011 +0200
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Wed Jul 27 20:34:09 2011 +0200
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
diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
index d6cac75..6251805 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 43802cc..0125346 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
)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c3852347082a4a0fbeab747d0ec975b72a13c27
commit 7c3852347082a4a0fbeab747d0ec975b72a13c27
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Wed Jul 27 20:32:59 2011 +0200
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Wed Jul 27 20:32:59 2011 +0200
Strip trailing whitespace
Alex
diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
index 8957b64..d6cac75 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 <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:
# #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 1fad07d..43802cc 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)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindFreetype.cmake | 25 ++++++--------------
Modules/FindGIF.cmake | 52 +++++++++++++++++++++++++++----------------
2 files changed, 41 insertions(+), 36 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list