diff --git a/CMakeLists.txt b/CMakeLists.txt index 794b2f1..21a579a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,14 +1,21 @@ 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( GLEW 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( ${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} -lOpenGL -lglut -lGLEW ) +target_link_libraries( fc2d ${OpenCV_LIBS} ${OPENGL_LIBRARIES} FreeGLUT::freeglut GLEW::glew ) set( CMAKE_BUILD_TYPE Debug ) diff --git a/src/graphics.cpp b/src/graphics.cpp index 5d39953..588ff9b 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -1,5 +1,6 @@ #include -#include //includes glu.h and gl.h +#include + #include #include #include diff --git a/src/graphics.hpp b/src/graphics.hpp index 57d992f..18f539a 100644 --- a/src/graphics.hpp +++ b/src/graphics.hpp @@ -1,7 +1,12 @@ #ifndef GRAPHICS_H #define GRAPHICS_H +#ifdef __APPLE__ +#include +#else #include +#endif + #include void initGraphics (); diff --git a/src/modelpart.cpp b/src/modelpart.cpp index d013f41..b5ea734 100644 --- a/src/modelpart.cpp +++ b/src/modelpart.cpp @@ -1,4 +1,5 @@ #include + #include #include