From e8df1282d2f9433cd720948da48ff11c180a3cb8 Mon Sep 17 00:00:00 2001
From: Epicalert <epicalert@protonmail.com>
Date: Thu, 7 Jan 2021 13:04:16 +0800
Subject: [PATCH 1/7] Remove find_package( GLEW ) from CMakeLists

It was already included by another package and causes problems when
compiling on MacOS.
---
 CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 794b2f1..6a0e46e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,6 @@ project( FaceCam2D VERSION 0.1.0 )
 find_package( OpenCV REQUIRED )
 find_package( VTK REQUIRED )
 find_package( HDF5 REQUIRED )
-find_package( GLEW REQUIRED )
 find_package( OpenGL REQUIRED )
 find_package( glm REQUIRED )
 find_package( FreeGLUT REQUIRED )

From e657b3d48e9adac5cc4bb59f05347a9b08d147cd Mon Sep 17 00:00:00 2001
From: Epicalert <epicalert@protonmail.com>
Date: Thu, 7 Jan 2021 13:12:36 +0800
Subject: [PATCH 2/7] Support Apple include files for OpenGL

---
 src/graphics.cpp  | 8 +++++++-
 src/graphics.hpp  | 5 +++++
 src/modelpart.cpp | 5 +++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/graphics.cpp b/src/graphics.cpp
index 3b9e880..b015ff4 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -1,5 +1,11 @@
+#ifdef __APPLE__
+#include <OpenGL/glew.h>
+#include <OpenGL/freeglut.h>
+#else
 #include <GL/glew.h>
-#include <GL/freeglut.h> //includes glu.h and gl.h
+#include <GL/freeglut.h>
+#endif
+
 #include <glm/mat4x4.hpp>
 #include <glm/ext/matrix_transform.hpp>
 #include <glm/gtc/type_ptr.hpp>
diff --git a/src/graphics.hpp b/src/graphics.hpp
index 8bbac13..1e583ee 100644
--- a/src/graphics.hpp
+++ b/src/graphics.hpp
@@ -1,7 +1,12 @@
 #ifndef GRAPHICS_H
 #define GRAPHICS_H
 
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#else
 #include <GL/gl.h>
+#endif
+
 #include <glm/vec2.hpp>
 
 void initGraphics ();
diff --git a/src/modelpart.cpp b/src/modelpart.cpp
index b5b8e35..c75f659 100644
--- a/src/modelpart.cpp
+++ b/src/modelpart.cpp
@@ -1,4 +1,9 @@
+#ifdef __APPLE__
+#include <OpenGL/glew.h>
+#else
 #include <GL/glew.h>
+#endif
+
 #include <glm/mat4x4.hpp>
 #include <glm/gtc/type_ptr.hpp>
 

From 3f195b5a99ae06d91533b906e93916386238e56c Mon Sep 17 00:00:00 2001
From: Epicalert <epicalert@protonmail.com>
Date: Thu, 7 Jan 2021 15:13:14 +0800
Subject: [PATCH 3/7] Add glm include dirs to CMakeLists

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a0e46e..d9f02a2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,7 @@ find_package( OpenGL REQUIRED )
 find_package( glm REQUIRED )
 find_package( FreeGLUT REQUIRED )
 include_directories( ${OpenCV_INCLUDE_DIRS} )
+include_directories( ${GLM_INCLUDE_DIRS} )
 include_directories( ${PROJECT_SOURCE_DIR}/src )
 add_executable( fc2d src/main.cpp src/graphics.cpp src/modelpart.cpp src/cv.cpp )
 target_link_libraries( fc2d ${OpenCV_LIBS} -lOpenGL -lglut -lGLEW )

From ce2a883d9ffd6464dd9df600cf575ec51c32bddc Mon Sep 17 00:00:00 2001
From: Epicalert <epicalert@protonmail.com>
Date: Mon, 11 Jan 2021 10:43:40 +0800
Subject: [PATCH 4/7] Add /usr/local/include to CMakeLists

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9f02a2..01dd72d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ find_package( OpenGL REQUIRED )
 find_package( glm REQUIRED )
 find_package( FreeGLUT REQUIRED )
 include_directories( ${OpenCV_INCLUDE_DIRS} )
-include_directories( ${GLM_INCLUDE_DIRS} )
+include_directories( /usr/local/include )
 include_directories( ${PROJECT_SOURCE_DIR}/src )
 add_executable( fc2d src/main.cpp src/graphics.cpp src/modelpart.cpp src/cv.cpp )
 target_link_libraries( fc2d ${OpenCV_LIBS} -lOpenGL -lglut -lGLEW )

From 3bc43149c52e4d1938c144206399d309ed7c09ac Mon Sep 17 00:00:00 2001
From: Epicalert <epicalert@protonmail.com>
Date: Mon, 11 Jan 2021 10:46:46 +0800
Subject: [PATCH 5/7] Fix apple headers

---
 src/graphics.cpp  | 5 -----
 src/modelpart.cpp | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/src/graphics.cpp b/src/graphics.cpp
index b015ff4..09900d9 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -1,10 +1,5 @@
-#ifdef __APPLE__
-#include <OpenGL/glew.h>
-#include <OpenGL/freeglut.h>
-#else
 #include <GL/glew.h>
 #include <GL/freeglut.h>
-#endif
 
 #include <glm/mat4x4.hpp>
 #include <glm/ext/matrix_transform.hpp>
diff --git a/src/modelpart.cpp b/src/modelpart.cpp
index c75f659..5ad7160 100644
--- a/src/modelpart.cpp
+++ b/src/modelpart.cpp
@@ -1,8 +1,4 @@
-#ifdef __APPLE__
-#include <OpenGL/glew.h>
-#else
 #include <GL/glew.h>
-#endif
 
 #include <glm/mat4x4.hpp>
 #include <glm/gtc/type_ptr.hpp>

From 17323f009262d893a6c46a42ea8bf7821cc38c18 Mon Sep 17 00:00:00 2001
From: Epicalert <epicalert@protonmail.com>
Date: Mon, 11 Jan 2021 12:42:47 +0800
Subject: [PATCH 6/7] Fix linking libraries on MacOS

---
 CMakeLists.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 01dd72d..9da554e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,14 +1,13 @@
 cmake_minimum_required( VERSION 3.0 )
 project( FaceCam2D VERSION 0.1.0 )
 find_package( OpenCV REQUIRED )
-find_package( VTK REQUIRED )
-find_package( HDF5 REQUIRED )
 find_package( OpenGL REQUIRED )
+find_package( GLEW REQUIRED )
 find_package( glm REQUIRED )
 find_package( FreeGLUT REQUIRED )
 include_directories( ${OpenCV_INCLUDE_DIRS} )
 include_directories( /usr/local/include )
 include_directories( ${PROJECT_SOURCE_DIR}/src )
 add_executable( fc2d src/main.cpp src/graphics.cpp src/modelpart.cpp src/cv.cpp )
-target_link_libraries( fc2d ${OpenCV_LIBS} -lOpenGL -lglut -lGLEW )
+target_link_libraries( fc2d ${OpenCV_LIBS} ${OPENGL_LIBRARIES} glut GLEW)
 set( CMAKE_BUILD_TYPE Debug )

From b1e98e9d3e4629fd3d507fe6fff627fbded005fe Mon Sep 17 00:00:00 2001
From: Epicalert <epicalert@protonmail.com>
Date: Tue, 12 Jan 2021 01:01:20 +0800
Subject: [PATCH 7/7] Remove hard-coded references to paths and libraries

---
 CMakeLists.txt | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9da554e..21a579a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,13 +1,21 @@
 cmake_minimum_required( VERSION 3.0 )
 project( FaceCam2D VERSION 0.1.0 )
 find_package( OpenCV REQUIRED )
+message (STATUS "Found OpenCV at: " ${OpenCV_INCLUDE_DIRS} )
 find_package( OpenGL REQUIRED )
+message (STATUS "Found OpenGL at: " ${OPENGL_INCLUDE_DIR} )
 find_package( GLEW REQUIRED )
+message (STATUS "Found GLEW at: " ${GLEW_INCLUDE_DIRS} )
 find_package( glm REQUIRED )
+message (STATUS "Found glm at: " ${GLM_INCLUDE_DIRS} )
 find_package( FreeGLUT REQUIRED )
+message (STATUS "Found FreeGLUT at: " ${GLUT_INCLUDE_DIR} )
 include_directories( ${OpenCV_INCLUDE_DIRS} )
-include_directories( /usr/local/include )
+include_directories( ${OPENGL_INCLUDE_DIR} )
+include_directories( ${GLEW_INCLUDE_DIRS} )
+include_directories( ${GLM_INCLUDE_DIRS} )
+include_directories( ${GLUT_INCLUDE_DIR} )
 include_directories( ${PROJECT_SOURCE_DIR}/src )
 add_executable( fc2d src/main.cpp src/graphics.cpp src/modelpart.cpp src/cv.cpp )
-target_link_libraries( fc2d ${OpenCV_LIBS} ${OPENGL_LIBRARIES} glut GLEW)
+target_link_libraries( fc2d ${OpenCV_LIBS} ${OPENGL_LIBRARIES} FreeGLUT::freeglut GLEW::glew )
 set( CMAKE_BUILD_TYPE Debug )