Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix cmake script that locates freetype #171

Merged
merged 1 commit into from
Apr 11, 2018
Merged

Fix cmake script that locates freetype #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down Expand Up @@ -174,4 +178,5 @@ install(DIRECTORY examples/ #NOTE The slash at the end is important
DESTINATION ${FG_INSTALL_EXAMPLE_DIR}
COMPONENT examples)

include(CPackConfig)
include(CPackConfig)

1 change: 0 additions & 1 deletion CMakeModules/Findfreetype.cmake → CMakeModules/freetype.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# FindFreeType.cmake
# Author: Pradeep Garigipati <pradeep@arrayfire.com>
#
# Heavy work is done by FindFreetype.cmake that comes along with
Expand Down