From bffbe94377b5e5515669f77e367fb6cee57d5de2 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Mon, 15 Sep 2014 14:30:24 -0700
Subject: [PATCH] Fix fontconfig cmake module

---
 cmake/Modules/FindFontconfig.cmake | 59 ++++++++++++++----------------
 1 file changed, 27 insertions(+), 32 deletions(-)

diff --git a/cmake/Modules/FindFontconfig.cmake b/cmake/Modules/FindFontconfig.cmake
index 321108cc6..205a9f51b 100644
--- a/cmake/Modules/FindFontconfig.cmake
+++ b/cmake/Modules/FindFontconfig.cmake
@@ -3,37 +3,32 @@
 #  FONTCONFIG_FOUND
 #  FONTCONFIG_INCLUDE_DIRS
 #  FONTCONFIG_LIBRARIES
-#
 
-if(FONTCONFIG_INCLUDE_DIRS AND FONTCONFIG_LIBRARIES)
-	set(FONTCONFIG_FOUND TRUE)
-else()
-	find_package(PkgConfig QUIET)
-	if (PKG_CONFIG_FOUND)
-		pkg_check_modules(_FONTCONFIG QUIET fontconfig)
-	endif()
-
-	find_path(FONTCONFIG_INCLUDE_DIR
-		NAMES fontconfig/fontconfig.h
-		HINTS
-			${_FONTCONFIG_INCLUDE_DIRS}
-		PATHS
-			/usr/include /usr/local/include /opt/local/include)
-
-	find_library(FONTCONFIG_LIB
-		NAMES fontconfig
-		HINTS
-			${_FONTCONFIG_LIBRARY_DIRS}
-		PATHS
-			/usr/lib /usr/local/lib /opt/local/lib)
-
-	set(FONTCONFIG_INCLUDE_DIRS ${FONTCONFIG_INCLUDE_DIR}
-		CACHE PATH "fontconfig include dir")
-	set(FONTCONFIG_LIBRARIES "${FONTCONFIG_LIB}"
-		CACHE STRING "fontconfig libraries")
-
-	include(FindPackageHandleStandardArgs)
-	find_package_handle_standard_args(Fontconfig DEFAULT_MSG FONTCONFIG_LIB
-		FONTCONFIG_INCLUDE_DIR)
-	mark_as_advanced(FONTCONFIG_INCLUDE_DIR FONTCONFIG_LIB)
+find_package(PkgConfig QUIET)
+if (PKG_CONFIG_FOUND)
+	pkg_check_modules(_FONTCONFIG QUIET fontconfig)
+endif()
+
+find_path(FONTCONFIG_INCLUDE_DIR
+	NAMES fontconfig/fontconfig.h
+	HINTS
+		${_FONTCONFIG_INCLUDE_DIRS}
+	PATHS
+		/usr/include /usr/local/include /opt/local/include)
+
+find_library(FONTCONFIG_LIB
+	NAMES fontconfig
+	HINTS
+		${_FONTCONFIG_LIBRARY_DIRS}
+	PATHS
+		/usr/lib /usr/local/lib /opt/local/lib)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Fontconfig DEFAULT_MSG FONTCONFIG_LIB
+	FONTCONFIG_INCLUDE_DIR)
+mark_as_advanced(FONTCONFIG_INCLUDE_DIR FONTCONFIG_LIB)
+
+if(FONTCONFIG_FOUND)
+	set(FONTCONFIG_INCLUDE_DIRS ${FONTCONFIG_INCLUDE_DIR})
+	set(FONTCONFIG_LIBRARIES "${FONTCONFIG_LIB}")
 endif()