diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c625f5a619fd5a6d0378f7a9c3c9bbd761d6c28a..b38d0436bd25ca0eb7639dbf5990defab701b8bd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -113,6 +113,7 @@ INCLUDE_DIRECTORIES(.)
 
 # include spdlog (logging) third_party
 INCLUDE_DIRECTORIES(../third_party/spdlog/include)
+set(SPDLOG_INCLUDE_DIRS "../third_party/spdlog/include/")
 
 INCLUDE_DIRECTORIES(${EIGEN_INCLUDE_DIRS})
 
@@ -175,6 +176,7 @@ SET(HDRS_BASE
     rotations.h
     sensor_base.h
     sensor_factory.h
+    singleton.h
     state_block.h
     state_homogeneous_3D.h
     state_quaternion.h
@@ -473,6 +475,8 @@ DESTINATION include/iri-algorithms/wolf/internal)
 
 INSTALL(FILES "${CMAKE_BINARY_DIR}/wolfConfig.cmake" DESTINATION "lib/cmake/${PROJECT_NAME}")
 
+INSTALL(DIRECTORY ${SPDLOG_INCLUDE_DIRS} DESTINATION "include/iri-algorithms/")
+
 export(PACKAGE ${PROJECT_NAME})
 
 IF(BUILD_EXAMPLES)
diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt
index 7c960973206437f7272d610e6d568156170e952d..2443c47af2e1790e6df050c8e970f8db4e3a10db 100644
--- a/src/examples/CMakeLists.txt
+++ b/src/examples/CMakeLists.txt
@@ -145,9 +145,11 @@ IF(OpenCV_FOUND)
     TARGET_LINK_LIBRARIES(test_ROI_ORB ${PROJECT_NAME})
 ENDIF(OpenCV_FOUND)
 
+IF(Ceres_FOUND)
 # Simple AHP test
 ADD_EXECUTABLE(test_simple_AHP test_simple_AHP.cpp)
 TARGET_LINK_LIBRARIES(test_simple_AHP ${PROJECT_NAME})
+ENDIF(Ceres_FOUND)
 
 # Processor Tracker Feature test
 ADD_EXECUTABLE(test_processor_tracker_feature test_processor_tracker_feature.cpp)