From 81100792f99f7546188802db071ed6423eed66a0 Mon Sep 17 00:00:00 2001 From: Nick Sharp Date: Wed, 13 Sep 2017 01:01:40 -0400 Subject: [PATCH] Recommend installing freetype --- CMU462/CMakeLists.txt | 3 +-- CMakeLists.txt | 6 +++--- README.md | 4 +++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CMU462/CMakeLists.txt b/CMU462/CMakeLists.txt index 50f6657..d0252c7 100644 --- a/CMU462/CMakeLists.txt +++ b/CMU462/CMakeLists.txt @@ -161,8 +161,7 @@ endif(WIN32) # Required packages find_package(OpenGL REQUIRED) if(NOT WIN32) - #find_package(Freetype REQUIRED) - add_subdirectory("${CMU462_SOURCE_DIR}/deps/freetype") + find_package(Freetype REQUIRED) endif() # Use pkg-config for GLEW & GLFW if available diff --git a/CMakeLists.txt b/CMakeLists.txt index d468ebf..80cdd5e 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -146,9 +146,9 @@ endif(WIN32) # Required packages find_package(OpenGL REQUIRED) find_package(Threads REQUIRED) -#if (NOT WIN32) -# find_package(Freetype REQUIRED) -#endif () +if (NOT WIN32) + find_package(Freetype REQUIRED) +endif () # CMU462 if(BUILD_LIBCMU462) diff --git a/README.md b/README.md index 7c11f4e..77241f8 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,9 @@ In order to ease the process of running on different platforms, we will be using #### OS X/Linux Build Instructions -If you are working on OS X and do not have CMake installed, we recommend installing it through [Homebrew](http://brew.sh/): `$ brew install cmake`. If you are working on Linux, you should be able to install dependencies with your system's package manager as needed. +If you are working on OS X and do not have CMake installed, we recommend installing it through [Homebrew](http://brew.sh/): `$ brew install cmake`. You may also need the freetype package `$ brew install freetype`. + +If you are working on Linux, you should be able to install dependencies with your system's package manager as needed (you may need cmake and freetype, and possibly others). To build your code for this assignment: -- GitLab