From ee3cfee3b390df51e37941a2c267101cf0c24565 Mon Sep 17 00:00:00 2001 From: pradeep Date: Wed, 11 Apr 2018 20:03:33 +0530 Subject: [PATCH] Fix cmake script that locates freetype --- CMakeLists.txt | 9 +++++++-- CMakeModules/{Findfreetype.cmake => freetype.cmake} | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) rename CMakeModules/{Findfreetype.cmake => freetype.cmake} (98%) diff --git a/CMakeLists.txt b/CMakeLists.txt index bea752d6..03ca7875 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,11 @@ if(FG_ENABLE_HUNTER) else() find_package(glbinding REQUIRED) find_package(glm REQUIRED) - find_package(freetype REQUIRED) + + # freetype.cmake builds freetype on windows + # and calls find_package(Freetype) on other platforms + include(freetype) + find_package(Boost REQUIRED) endif() @@ -174,4 +178,5 @@ install(DIRECTORY examples/ #NOTE The slash at the end is important DESTINATION ${FG_INSTALL_EXAMPLE_DIR} COMPONENT examples) -include(CPackConfig) \ No newline at end of file +include(CPackConfig) + diff --git a/CMakeModules/Findfreetype.cmake b/CMakeModules/freetype.cmake similarity index 98% rename from CMakeModules/Findfreetype.cmake rename to CMakeModules/freetype.cmake index c82c71fc..23ea73a8 100644 --- a/CMakeModules/Findfreetype.cmake +++ b/CMakeModules/freetype.cmake @@ -1,4 +1,3 @@ -# FindFreeType.cmake # Author: Pradeep Garigipati # # Heavy work is done by FindFreetype.cmake that comes along with