- updated to 3.0.2

[packages/cmake.git] / cmake-freetype2.patch

diff --git a/cmake-freetype2.patch b/cmake-freetype2.patch
deleted file mode 100644 (file)
index af96e33..0000000
--- a/cmake-freetype2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- cmake-2.8.12.1/Modules/FindFreetype.cmake.orig     2013-11-05 20:07:22.000000000 +0100
-+++ cmake-2.8.12.1/Modules/FindFreetype.cmake  2013-12-06 19:50:19.371935997 +0100
-@@ -56,7 +56,7 @@
-   PATH_SUFFIXES include/freetype2 include
- )
- 
--find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
-+find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
-   HINTS
-     ENV FREETYPE_DIR
-   PATHS
-@@ -67,7 +67,7 @@
-     ENV GTKMM_BASEPATH
-     [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
-     [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
--  PATH_SUFFIXES include/freetype2 include
-+  PATH_SUFFIXES include/freetype2/freetype include/freetype2 include
- )
- 
- find_library(FREETYPE_LIBRARY
-@@ -87,12 +87,12 @@
- 
- # 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}")
-+  set(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR_ft2build}")
- endif()
- set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}")
- 
--if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
--    file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str
-+if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
-+    file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h" freetype_version_str
-          REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$")
- 
-     unset(FREETYPE_VERSION_STRING)