From ae6168e53467a1c96b3070c6657c91fcc9590fe7 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Wed, 13 Apr 2016 20:37:30 +0200
Subject: [PATCH] Merge with develop

---
 code/CMakeLists.txt | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index 9b9abe1c7..393d51dfb 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -328,13 +328,19 @@ IF(WITH_QT5)
       ENDIF()
 
       # freetype is needed since Qt 5.5
-      IF(UNIX)
-        SET(FREETYPE_LIB "${QT_LIBRARY_DIR}/libqtfreetype.a")
-      ELSEIF(WIN32)
-        SET(FREETYPE_LIB "${QT_LIBRARY_DIR}/qtfreetype.lib")
-      ENDIF()
-      IF(EXISTS ${FREETYPE_LIB})
-        SET(QT_LIBRARIES ${QT_LIBRARIES} ${FREETYPE_LIB})
+      FIND_PACKAGE(FreeType)
+
+      IF(FREETYPE_FOUND)
+        SET(QT_LIBRARIES ${QT_LIBRARIES} ${FREETYPE_LIBRARIES})
+      ELSE()
+        IF(UNIX)
+          SET(FREETYPE_LIB "${QT_LIBRARY_DIR}/libqtfreetype.a")
+        ELSEIF(WIN32)
+          SET(FREETYPE_LIB "${QT_LIBRARY_DIR}/qtfreetype.lib")
+        ENDIF()
+        IF(EXISTS ${FREETYPE_LIB})
+          SET(QT_LIBRARIES ${QT_LIBRARIES} ${FREETYPE_LIB})
+        ENDIF()
       ENDIF()
 
       ADD_QT_PLUGIN(accessible qtaccessiblewidgets)