[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-173-gc9281fd

Brad King brad.king at kitware.com
Thu Jun 9 09:51:03 EDT 2016


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  c9281fd5147ba30d4da375ddbfa27bc1854b0220 (commit)
       via  b0c65f3621b8778a777a408bfb07d43e0c8d6539 (commit)
      from  62fdf5d4646b6ca5a005cdea2804a47c7331e88a (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=c9281fd5147ba30d4da375ddbfa27bc1854b0220
commit c9281fd5147ba30d4da375ddbfa27bc1854b0220
Merge: 62fdf5d b0c65f3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 9 09:51:02 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 9 09:51:02 2016 -0400

    Merge topic 'FindFreetype-debug-libs' into next
    
    b0c65f36 Revert "FindFreetype: Search for a separate debug library"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0c65f3621b8778a777a408bfb07d43e0c8d6539
commit b0c65f3621b8778a777a408bfb07d43e0c8d6539
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 9 09:50:53 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 9 09:50:53 2016 -0400

    Revert "FindFreetype: Search for a separate debug library"
    
    This reverts commit 6085b855edf0b9406cc40728e790784016c78dd3.

diff --git a/Help/release/dev/FindFreetype-debug-libs.rst b/Help/release/dev/FindFreetype-debug-libs.rst
deleted file mode 100644
index f651c73..0000000
--- a/Help/release/dev/FindFreetype-debug-libs.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-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 16df708..dc6336d 100644
--- a/Modules/FindFreetype.cmake
+++ b/Modules/FindFreetype.cmake
@@ -96,17 +96,6 @@ 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)
 

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

Summary of changes:
 Help/release/dev/FindFreetype-debug-libs.rst |    4 ----
 Modules/FindFreetype.cmake                   |   11 -----------
 2 files changed, 15 deletions(-)
 delete mode 100644 Help/release/dev/FindFreetype-debug-libs.rst


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list