Merge branch 'remove_suitesparse' into devel

CMakeLists.txt

@@ -101,7 +101,7 @@ FIND_PACKAGE(wolf REQUIRED)
 FIND_PACKAGE(YamlCpp REQUIRED)
 
 IF(YAMLCPP_FOUND)
-    MESSAGE("yaml-cpp Library FOUND: yaml-cpp related sources will be built.")
+    MESSAGE("yaml-cpp Library FOUND!")
 ELSEIF(YAMLCPP_FOUND)
     MESSAGE("yaml-cpp Library NOT FOUND!")
 ENDIF(YAMLCPP_FOUND)
@@ -112,19 +112,19 @@ IF(Ceres_FOUND)
 ENDIF(Ceres_FOUND)
 
 
-FIND_PATH(
-    Suitesparse_INCLUDE_DIRS
-    NAMES SuiteSparse_config.h
-    PATHS /usr/include/suitesparse /usr/local/include/suitesparse)
-MESSAGE("Found suitesparse_INCLUDE_DIRS:" ${Suitesparse_INCLUDE_DIRS})
+#FIND_PATH(
+#    Suitesparse_INCLUDE_DIRS
+#    NAMES SuiteSparse_config.h
+#    PATHS /usr/include/suitesparse /usr/local/include/suitesparse)
+#MESSAGE("Found suitesparse_INCLUDE_DIRS:" ${Suitesparse_INCLUDE_DIRS})
 
-IF(Suitesparse_INCLUDE_DIRS)
-   SET(Suitesparse_FOUND TRUE)
-   MESSAGE("Suitesparse FOUND: wolf_solver will be built.")
-ELSE (Suitesparse_INCLUDE_DIRS)
-   SET(Suitesparse_FOUND FALSE)
-   MESSAGE(FATAL_ERROR "Suitesparse NOT FOUND")
-ENDIF (Suitesparse_INCLUDE_DIRS)
+#IF(Suitesparse_INCLUDE_DIRS)
+#   SET(Suitesparse_FOUND TRUE)
+#   MESSAGE("Suitesparse FOUND: wolf_solver will be built.")
+#ELSE (Suitesparse_INCLUDE_DIRS)
+#   SET(Suitesparse_FOUND FALSE)
+#   MESSAGE(FATAL_ERROR "Suitesparse NOT FOUND")
+#ENDIF (Suitesparse_INCLUDE_DIRS)
 
 # Define the directory where will be the configured config.h
 SET(WOLF_CONFIG_DIR ${PROJECT_BINARY_DIR}/conf/${PROJECT_NAME}/internal)
@@ -262,22 +262,22 @@ ADD_LIBRARY(${PLUGIN_NAME}
   ${SRCS_WRAPPER}
   ${SRCS_YAML}
   )
-TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${CMAKE_THREAD_LIBS_INIT})
-TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${YAMLCPP_LIBRARY})
 
 #Link the created libraries
 #===============EXAMPLE=========================
 # IF (Ceres_FOUND)
 #     TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${CERES_LIBRARIES})
 # ENDIF(Ceres_FOUND)
-
-
-#Build tests
-#===============EXAMPLE=========================
+TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${CMAKE_THREAD_LIBS_INIT})
+TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${wolf_LIBRARY})
+TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${YAMLCPP_LIBRARY})
 IF (GLOG_FOUND)
     TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${GLOG_LIBRARY})
 ENDIF (GLOG_FOUND)
 
+
+#Build tests
+#===============EXAMPLE=========================
 IF (GLOG_FOUND)
     IF(BUILD_TESTS)
         MESSAGE("Building tests.")
@@ -317,8 +317,8 @@ INSTALL(FILES ${HDRS_LANDMARK}
   DESTINATION include/iri-algorithms/wolf/plugin_${PROJECT_NAME}/${PROJECT_NAME}/landmark)
 INSTALL(FILES ${HDRS_WRAPPER}
   DESTINATION include/iri-algorithms/wolf/plugin_${PROJECT_NAME}/${PROJECT_NAME}/ceres_wrapper)
-INSTALL(FILES ${HDRS_SOLVER_SUITESPARSE}
-  DESTINATION include/iri-algorithms/wolf/plugin_${PROJECT_NAME}/${PROJECT_NAME}/solver_suitesparse)
+#INSTALL(FILES ${HDRS_SOLVER_SUITESPARSE}
+#  DESTINATION include/iri-algorithms/wolf/plugin_${PROJECT_NAME}/${PROJECT_NAME}/solver_suitesparse)
 INSTALL(FILES ${HDRS_SOLVER}
   DESTINATION include/iri-algorithms/wolf/plugin_${PROJECT_NAME}/${PROJECT_NAME}/solver)
 INSTALL(FILES ${HDRS_SERIALIZATION}

cmake_modules/wolfIMUConfig.cmake

@@ -11,7 +11,7 @@ ENDIF(wolfIMU_INCLUDE_DIR)
 
 FIND_LIBRARY(
     wolfIMU_LIBRARY
-    NAMES libwolfIMU.so
+    NAMES libwolfIMU.so libwolfIMU.dylib
     PATHS /usr/local/lib/iri-algorithms)
 IF(wolfIMU_LIBRARY)
   MESSAGE("Found wolf IMU lib: ${wolfIMU_LIBRARY}")