From 0127318d16fb4ab1ea2f6135396e7d087eeccc0c Mon Sep 17 00:00:00 2001 From: rich_b <56879808+rbarkmore@users.noreply.github.com> Date: Sat, 28 Nov 2020 13:32:49 -0500 Subject: [PATCH 1/3] Added ${FREETYPE_LIBRARIES} to Apple linking step. Copied from Issue #207. Needs to be tested by someone who runs Mac OS. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a60f028d3..1238f423d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,7 @@ elseif(APPLE) FIND_LIBRARY(CoreVideo_LIBRARY CoreVideo) MARK_AS_ADVANCED(COCOA_LIBRARY OpenGL_LIBRARY) SET(APPLE_LIBS ${COCOA_LIBRARY} ${IOKit_LIBRARY} ${OpenGL_LIBRARY} ${CoreVideo_LIBRARY}) - SET(APPLE_LIBS ${APPLE_LIBS} ${GLFW3_LIBRARY} ${ASSIMP_LIBRARY}) + SET(APPLE_LIBS ${APPLE_LIBS} ${GLFW3_LIBRARY} ${ASSIMP_LIBRARY} ${FREETYPE_LIBRARIES}) set(LIBS ${LIBS} ${APPLE_LIBS}) else() set(LIBS ) From 641dc67b66958b7e6f596427b66de1dac3cda77c Mon Sep 17 00:00:00 2001 From: rich_b <56879808+rbarkmore@users.noreply.github.com> Date: Sat, 28 Nov 2020 14:50:53 -0500 Subject: [PATCH 2/3] Added 'freetype' to brew install... in the Readme.md. This should be needed to make sure that freetype is installed in Mac OS, based on issue #196. Needs to be tested by someone running Mac OS. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a69b78ed6..4c4663dc2 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Using [this project](https://github.com/01e9/docker-ide) you can start IDE in do ## Mac OS X building Building on Mac OS X is fairly simple (thanks [@hyperknot](https://github.com/hyperknot)): ``` -brew install cmake assimp glm glfw +brew install cmake assimp glm glfw freetype mkdir build cd build cmake ../. From 10a32e98ae61cabd884f03ddf27bff418065f2ad Mon Sep 17 00:00:00 2001 From: rich_b <56879808+rbarkmore@users.noreply.github.com> Date: Fri, 18 Dec 2020 08:14:05 -0500 Subject: [PATCH 3/3] For macOS, added find package for Freetype. This needs to be tested by someone with macOS. --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1238f423d..0c3db156b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,6 +46,8 @@ elseif(APPLE) FIND_LIBRARY(OpenGL_LIBRARY OpenGL) FIND_LIBRARY(IOKit_LIBRARY IOKit) FIND_LIBRARY(CoreVideo_LIBRARY CoreVideo) + find_package(Freetype REQUIRED) + message(STATUS "Found Freetype in ${FREETYPE_INCLUDE_DIR}") MARK_AS_ADVANCED(COCOA_LIBRARY OpenGL_LIBRARY) SET(APPLE_LIBS ${COCOA_LIBRARY} ${IOKit_LIBRARY} ${OpenGL_LIBRARY} ${CoreVideo_LIBRARY}) SET(APPLE_LIBS ${APPLE_LIBS} ${GLFW3_LIBRARY} ${ASSIMP_LIBRARY} ${FREETYPE_LIBRARIES})