Fix freetype detection

Don't reinvent freetype detection, use working one from cmake.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ff700257c5563f28ffd6defb9d26e25ae872de35..88ab995ba60a8349b0cc9f228bd6298e92491caa 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -111,23 +111,30 @@ option(ENABLE_FREETYPE "Enable FreeType2 (TrueType fonts and basic unicode suppo
 set(USE_FREETYPE FALSE)
 
 if(ENABLE_FREETYPE)
-       if(UNIX)
-               include(FindPkgConfig)
-               if(PKG_CONFIG_FOUND)
-                       pkg_check_modules(FREETYPE QUIET freetype2)
-                       if(FREETYPE_FOUND)
-                               SET(FREETYPE_PKGCONFIG_FOUND TRUE)
-                               SET(FREETYPE_LIBRARY ${FREETYPE_LIBRARIES})
-                               # Because CMake is idiotic
-                               string(REPLACE ";" " " FREETYPE_CFLAGS_STR ${FREETYPE_CFLAGS})
-                               string(REPLACE ";" " " FREETYPE_LDFLAGS_STR ${FREETYPE_LDFLAGS})
-                       endif(FREETYPE_FOUND)
-               endif(PKG_CONFIG_FOUND)
-       endif(UNIX)
-       if(NOT FREETYPE_FOUND)
-               find_package(Freetype)
-       endif()
+##
+## Note: FindFreetype.cmake seems to have been fixed in recent versions of
+## CMake. If issues persist, re-enable this workaround specificially for the
+## failing platforms.
+##
+#      if(UNIX)
+#              include(FindPkgConfig)
+#              if(PKG_CONFIG_FOUND)
+#                      pkg_check_modules(FREETYPE QUIET freetype2)
+#                      if(FREETYPE_FOUND)
+#                              SET(FREETYPE_PKGCONFIG_FOUND TRUE)
+#                              SET(FREETYPE_LIBRARY ${FREETYPE_LIBRARIES})
+#                              # Because CMake is idiotic
+#                              string(REPLACE ";" " " FREETYPE_CFLAGS_STR ${FREETYPE_CFLAGS})
+#                              string(REPLACE ";" " " FREETYPE_LDFLAGS_STR ${FREETYPE_LDFLAGS})
+#                      endif(FREETYPE_FOUND)
+#              endif(PKG_CONFIG_FOUND)
+#      endif(UNIX)
+#      if(NOT FREETYPE_FOUND)
+#              find_package(Freetype)
+#      endif()
+       find_package(Freetype)
        if(FREETYPE_FOUND)
+               message(STATUS "Freetype enabled.")
                set(USE_FREETYPE TRUE)
                set(CGUITTFONT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cguittfont")
                set(CGUITTFONT_LIBRARY cguittfont)