Skip to content

GitLab

Commit fec01956 authored by Nick Sharp's avatar Nick Sharp
Browse files

Build with local freetype

parent 0a7a5799
Show whitespace changes
Inline Side-by-side
CMU462/CMakeLists.txt
View file @ fec01956
...@@ -161,7 +161,8 @@ endif(WIN32) ...@@ -161,7 +161,8 @@ endif(WIN32)
# Required packages # Required packages
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
if(NOT WIN32) if(NOT WIN32)
find_package(Freetype REQUIRED) #find_package(Freetype REQUIRED)
add_subdirectory("${CMU462_SOURCE_DIR}/deps/freetype")
endif() endif()
# Use pkg-config for GLEW & GLFW if available # Use pkg-config for GLEW & GLFW if available
......
CMakeLists.txt
View file @ fec01956
...@@ -146,9 +146,9 @@ endif(WIN32) ...@@ -146,9 +146,9 @@ endif(WIN32)
# Required packages # Required packages
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
if (NOT WIN32) #if (NOT WIN32)
find_package(Freetype REQUIRED) # find_package(Freetype REQUIRED)
endif () #endif ()
# CMU462 # CMU462
if(BUILD_LIBCMU462) if(BUILD_LIBCMU462)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment