[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3376-g70459c9
Brad King
brad.king at kitware.com
Tue May 27 10:41:11 EDT 2014
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 70459c917e6cfbe265d58dba229aa49b22eac74f (commit)
via 58f7baab146cda9e11976d8362b8476d8ee5f264 (commit)
via 444f88014624b369f356d27c228a4ad98656e7f4 (commit)
via 836a28d5376cadd8da2febc8b0757283d7ecb182 (commit)
via 4ad6dacede10ce369c0e7bd0d4c8fe89d48cf4de (commit)
from 9d2d4b9c55d67418b9cb90e77af265f7d5f627ea (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=70459c917e6cfbe265d58dba229aa49b22eac74f
commit 70459c917e6cfbe265d58dba229aa49b22eac74f
Merge: 9d2d4b9 58f7baa
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 27 10:41:10 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 27 10:41:10 2014 -0400
Merge topic 'FindFreetype-updates' into next
58f7baab FindFreetype: Indent with 2 spaces instead of 4
444f8801 FindFreetype: Use lower-case name in call to FPHSA
836a28d5 FindFreetype: Move PATH_SUFFIXES argument for more consistency
4ad6dace FindFreetype: Add newlines to reduce code width
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58f7baab146cda9e11976d8362b8476d8ee5f264
commit 58f7baab146cda9e11976d8362b8476d8ee5f264
Author: Taylor Holberton <taylorcholberton at gmail.com>
AuthorDate: Sat May 24 21:38:43 2014 -0700
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue May 27 10:42:10 2014 -0400
FindFreetype: Indent with 2 spaces instead of 4
This is more consistent with style elsewhere.
diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
index 8e48b65..7d46d15 100644
--- a/Modules/FindFreetype.cmake
+++ b/Modules/FindFreetype.cmake
@@ -124,23 +124,23 @@ elseif(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
endif()
if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H)
- file(STRINGS "${FREETYPE_H}" freetype_version_str
- REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$")
+ file(STRINGS "${FREETYPE_H}" freetype_version_str
+ REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$")
- unset(FREETYPE_VERSION_STRING)
- foreach(VPART MAJOR MINOR PATCH)
- foreach(VLINE ${freetype_version_str})
- if(VLINE MATCHES "^#[\t ]*define[\t ]+FREETYPE_${VPART}[\t ]+([0-9]+)$")
- set(FREETYPE_VERSION_PART "${CMAKE_MATCH_1}")
- if(FREETYPE_VERSION_STRING)
- set(FREETYPE_VERSION_STRING "${FREETYPE_VERSION_STRING}.${FREETYPE_VERSION_PART}")
- else()
- set(FREETYPE_VERSION_STRING "${FREETYPE_VERSION_PART}")
- endif()
- unset(FREETYPE_VERSION_PART)
- endif()
- endforeach()
+ unset(FREETYPE_VERSION_STRING)
+ foreach(VPART MAJOR MINOR PATCH)
+ foreach(VLINE ${freetype_version_str})
+ if(VLINE MATCHES "^#[\t ]*define[\t ]+FREETYPE_${VPART}[\t ]+([0-9]+)$")
+ set(FREETYPE_VERSION_PART "${CMAKE_MATCH_1}")
+ if(FREETYPE_VERSION_STRING)
+ set(FREETYPE_VERSION_STRING "${FREETYPE_VERSION_STRING}.${FREETYPE_VERSION_PART}")
+ else()
+ set(FREETYPE_VERSION_STRING "${FREETYPE_VERSION_PART}")
+ endif()
+ unset(FREETYPE_VERSION_PART)
+ endif()
endforeach()
+ endforeach()
endif()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=444f88014624b369f356d27c228a4ad98656e7f4
commit 444f88014624b369f356d27c228a4ad98656e7f4
Author: Taylor Holberton <taylorcholberton at gmail.com>
AuthorDate: Sat May 24 21:37:28 2014 -0700
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue May 27 10:42:10 2014 -0400
FindFreetype: Use lower-case name in call to FPHSA
Use 'find_package_handle_standard_args' because lower-case style is
now preferred.
diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
index 95ecaf9..8e48b65 100644
--- a/Modules/FindFreetype.cmake
+++ b/Modules/FindFreetype.cmake
@@ -147,7 +147,8 @@ endif()
# 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(
+
+find_package_handle_standard_args(
Freetype
REQUIRED_VARS
FREETYPE_LIBRARY
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=836a28d5376cadd8da2febc8b0757283d7ecb182
commit 836a28d5376cadd8da2febc8b0757283d7ecb182
Author: Taylor Holberton <taylorcholberton at gmail.com>
AuthorDate: Sat May 24 21:35:39 2014 -0700
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue May 27 10:42:10 2014 -0400
FindFreetype: Move PATH_SUFFIXES argument for more consistency
diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
index 94f4f53..95ecaf9 100644
--- a/Modules/FindFreetype.cmake
+++ b/Modules/FindFreetype.cmake
@@ -98,7 +98,6 @@ find_library(FREETYPE_LIBRARY
freetype219
HINTS
ENV FREETYPE_DIR
- PATH_SUFFIXES lib
PATHS
/usr/X11R6
/usr/local/X11R6
@@ -107,6 +106,8 @@ find_library(FREETYPE_LIBRARY
ENV GTKMM_BASEPATH
[HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
[HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
+ PATH_SUFFIXES
+ lib
)
# set the user variables
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ad6dacede10ce369c0e7bd0d4c8fe89d48cf4de
commit 4ad6dacede10ce369c0e7bd0d4c8fe89d48cf4de
Author: Taylor Holberton <taylorcholberton at gmail.com>
AuthorDate: Sat May 24 21:34:01 2014 -0700
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue May 27 10:42:10 2014 -0400
FindFreetype: Add newlines to reduce code width
This also makes argument lists easier to update.
diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
index 1779b78..94f4f53 100644
--- a/Modules/FindFreetype.cmake
+++ b/Modules/FindFreetype.cmake
@@ -51,7 +51,9 @@
# wants explicit full paths and this trickery doesn't work too well.
# 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
PATHS
@@ -62,10 +64,14 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
ENV GTKMM_BASEPATH
[HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
[HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
- PATH_SUFFIXES include/freetype2 include freetype2
+ PATH_SUFFIXES
+ include/freetype2
+ include
+ freetype2
)
-find_path(FREETYPE_INCLUDE_DIR_freetype2
+find_path(
+ FREETYPE_INCLUDE_DIR_freetype2
NAMES
freetype/config/ftheader.h
config/ftheader.h
@@ -79,11 +85,17 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2
ENV GTKMM_BASEPATH
[HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
[HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
- PATH_SUFFIXES include/freetype2 include freetype2
+ PATH_SUFFIXES
+ include/freetype2
+ include
+ freetype2
)
find_library(FREETYPE_LIBRARY
- NAMES freetype libfreetype freetype219
+ NAMES
+ freetype
+ libfreetype
+ freetype219
HINTS
ENV FREETYPE_DIR
PATH_SUFFIXES lib
@@ -134,8 +146,17 @@ endif()
# 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
- REQUIRED_VARS FREETYPE_LIBRARY FREETYPE_INCLUDE_DIRS
- VERSION_VAR FREETYPE_VERSION_STRING)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(
+ Freetype
+ REQUIRED_VARS
+ FREETYPE_LIBRARY
+ FREETYPE_INCLUDE_DIRS
+ VERSION_VAR
+ FREETYPE_VERSION_STRING
+)
-mark_as_advanced(FREETYPE_LIBRARY FREETYPE_INCLUDE_DIR_freetype2 FREETYPE_INCLUDE_DIR_ft2build)
+mark_as_advanced(
+ FREETYPE_LIBRARY
+ FREETYPE_INCLUDE_DIR_freetype2
+ FREETYPE_INCLUDE_DIR_ft2build
+)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindFreetype.cmake | 73 +++++++++++++++++++++++++++++---------------
1 file changed, 48 insertions(+), 25 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list