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)