[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-159-gad0f722

[Brad King]

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  ad0f722461761a9bf2a63ae1a124ed7b7a572ffb (commit)
       via  6085b855edf0b9406cc40728e790784016c78dd3 (commit)
       via  746a4245738c7b3c0b29754cb09b2230697f13fc (commit)
      from  ca701b2c12979cf70f7f824d93e735c8d78a564f (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad0f722461761a9bf2a63ae1a124ed7b7a572ffb
commit ad0f722461761a9bf2a63ae1a124ed7b7a572ffb
Merge: ca701b2 6085b85
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 9 09:00:42 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 9 09:00:42 2016 -0400

    Merge topic 'FindFreetype-debug-libs' into next
    
    6085b855 FindFreetype: Search for a separate debug library
    746a4245 FindFreetype: Factor out common find command arguments


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6085b855edf0b9406cc40728e790784016c78dd3
commit 6085b855edf0b9406cc40728e790784016c78dd3
Author:     Stuart Mentzer <Stuart_Mentzer at objexx.com>
AuthorDate: Wed Jun 8 00:26:31 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 9 08:57:48 2016 -0400

    FindFreetype: Search for a separate debug library

diff --git a/Help/release/dev/FindFreetype-debug-libs.rst b/Help/release/dev/FindFreetype-debug-libs.rst
new file mode 100644
index 0000000..f651c73
--- /dev/null
+++ b/Help/release/dev/FindFreetype-debug-libs.rst
@@ -0,0 +1,4 @@
+FindFreetype-debug-libs
+-----------------------
+
+* The :module:`FindFreetype` module learned to find a separate debug library.
diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
index dc6336d..16df708 100644
--- a/Modules/FindFreetype.cmake
+++ b/Modules/FindFreetype.cmake
@@ -96,6 +96,17 @@ find_library(FREETYPE_LIBRARY
   PATH_SUFFIXES
     lib
 )
+find_library(FREETYPE_LIBRARY_DEBUG
+  NAMES
+    freetyped
+    libfreetyped
+    freetype219d
+  ${FREETYPE_FIND_ARGS}
+  PATH_SUFFIXES
+    lib
+)
+include(SelectLibraryConfigurations)
+select_library_configurations(FREETYPE)
 
 unset(FREETYPE_FIND_ARGS)
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=746a4245738c7b3c0b29754cb09b2230697f13fc
commit 746a4245738c7b3c0b29754cb09b2230697f13fc
Author:     Stuart Mentzer <Stuart_Mentzer at objexx.com>
AuthorDate: Wed Jun 8 00:26:31 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 9 08:55:24 2016 -0400

    FindFreetype: Factor out common find command arguments

diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
index 7d46d15..dc6336d 100644
--- a/Modules/FindFreetype.cmake
+++ b/Modules/FindFreetype.cmake
@@ -51,9 +51,8 @@
 # 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
+
+set(FREETYPE_FIND_ARGS
   HINTS
     ENV FREETYPE_DIR
   PATHS
@@ -64,6 +63,12 @@ find_path(
     ENV GTKMM_BASEPATH
     [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
+)
+
+find_path(
+  FREETYPE_INCLUDE_DIR_ft2build
+  ft2build.h
+  ${FREETYPE_FIND_ARGS}
   PATH_SUFFIXES
     include/freetype2
     include
@@ -75,16 +80,7 @@ find_path(
   NAMES
     freetype/config/ftheader.h
     config/ftheader.h
-  HINTS
-    ENV FREETYPE_DIR
-  PATHS
-    /usr/X11R6
-    /usr/local/X11R6
-    /usr/local/X11
-    /usr/freeware
-    ENV GTKMM_BASEPATH
-    [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
+  ${FREETYPE_FIND_ARGS}
   PATH_SUFFIXES
     include/freetype2
     include
@@ -96,20 +92,13 @@ find_library(FREETYPE_LIBRARY
     freetype
     libfreetype
     freetype219
-  HINTS
-    ENV FREETYPE_DIR
-  PATHS
-    /usr/X11R6
-    /usr/local/X11R6
-    /usr/local/X11
-    /usr/freeware
-    ENV GTKMM_BASEPATH
-    [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
+  ${FREETYPE_FIND_ARGS}
   PATH_SUFFIXES
     lib
 )
 
+unset(FREETYPE_FIND_ARGS)
+
 # set the user variables
 if(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
   set(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR_ft2build};${FREETYPE_INCLUDE_DIR_freetype2}")

-----------------------------------------------------------------------

Summary of changes:
 Help/release/dev/FindFreetype-debug-libs.rst |    4 +++
 Modules/FindFreetype.cmake                   |   46 +++++++++++++-------------
 2 files changed, 27 insertions(+), 23 deletions(-)
 create mode 100644 Help/release/dev/FindFreetype-debug-libs.rst


hooks/post-receive
-- 
CMake