Improve CMake structure.

CMakeLists.txt

@@ -21,54 +21,35 @@ target_compile_options(fmri PRIVATE "-Wall" "-Wextra" "-pedantic")
 # Enable CUDA if available
 find_package(CUDA)
 if (CUDA_FOUND)
-	include_directories(${CUDA_INCLUDE_DIRS})
-	target_link_libraries(fmri ${CUDA_LIBS})
+	target_include_directories(fmri PUBLIC ${CUDA_INCLUDE_DIRS})
+	target_link_libraries(fmri PUBLIC ${CUDA_LIBS})
 else()
 	add_definitions(-DCPU_ONLY)
 endif()
 
-
-# Library dependencies
-# Require OpenCV
+# Find dependencies
 find_package(OpenCV REQUIRED)
-include_directories(${OpenCV_INCLUDE_DIRS})
-target_link_libraries(fmri ${OpenCV_LIBS})
-
-# Require Boost
 find_package(Boost REQUIRED COMPONENTS system)
-include_directories(${Boost_INCLUDE_DIRS})
-target_link_libraries(fmri ${Boost_LIBRARIES})
-
-# Require Caffe
 find_package(Caffe REQUIRED)
-include_directories(${Caffe_INCLUDE_DIRS})
-target_link_libraries(fmri ${Caffe_LIBRARIES})
-
-# Require glog
 find_package(Glog REQUIRED)
-include_directories(${GLOG_INCLUDE_DIRS})
-target_link_libraries(fmri ${GLOG_LIBRARIES})
-
-# Require png++ (dumping to file)
-find_package(png++ REQUIRED)
-include_directories(${png++_INCLUDE_DIRS})
-target_link_libraries(fmri ${png++_LIBRARIES})
-
-# Require GLUT (visualisation)
-find_package(GLUT REQUIRED)
-include_directories(${GLUT_INCLUDE_DIRS})
-target_link_libraries(fmri ${GLUT_LIBRARIES})
-
-# Require OpenGL (visualisation)
 find_package(OpenGL REQUIRED)
-include_directories(${OPENGL_INCLUDE_DIRS})
-target_link_libraries(fmri ${OPENGL_LIBRARIES})
+find_package(GLUT REQUIRED)
+find_package(png++ REQUIRED)
 
-# Require GLEW (visulalisation)
-find_package(GLEW REQUIRED)
-include_directories(${GLEW_INCLUDE_DIRS})
-target_link_libraries(fmri ${GLEW_LIBRARIES})
+target_include_directories(fmri PUBLIC ${OpenCV_INCLUDE_DIRS})
+target_link_libraries(fmri PUBLIC
+	${OpenCV_LIBS}
+	${Caffe_LIBRARIES}
+	${png++_LIBRARIES}
+	${GLOG_LIBRARIES}
+	Boost::system
+	GLUT::GLUT
+	OpenGL::GLU
+	)
 
+target_include_directories(fmri PUBLIC
+	${Caffe_INCLUDE_DIRS}
+	)
 
 # Allow the package to be installed
 install(TARGETS fmri DESTINATION bin)

src/glutils.cpp

@@ -1,7 +1,6 @@
 #include <cstdint>
 #include <memory>
 #include <vector>
-#include <GL/glew.h>
 #include <cstring>
 #include <glog/logging.h>
 #include <chrono>
@@ -18,7 +17,7 @@ static void handleGLError(GLenum error) {
             return;
 
         default:
-            cerr << "OpenGL error: " << (const char*) glewGetErrorString(error) << endl;
+            cerr << "OpenGL error: " << (const char*) gluGetString(error) << endl;
     }
 }
 

src/main.cpp

@@ -1,7 +1,6 @@
 #include <algorithm>
 #include <iostream>
 #include <glog/logging.h>
-#include <GL/glew.h>
 #include <GL/glut.h>
 #include <map>
 
@@ -192,12 +191,6 @@ int main(int argc, char *argv[])
 
     Camera::instance().registerControls();
 
-    glewInit();
-    if (!GLEW_VERSION_2_0) {
-        cerr << "OpenGL 2.0 not available" << endl;
-        return 2;
-    }
-
     rendererData.currentData = rendererData.data.begin();
     updateVisualisers();
 

src/visualisations.cpp

@@ -1,6 +1,6 @@
 #include <algorithm>
 #include <numeric>
-#include <util/math_functions.hpp>
+#include <caffe/util/math_functions.hpp>
 #include "visualisations.hpp"
 #include "DummyLayerVisualisation.hpp"
 #include "MultiImageVisualisation.hpp"