Skip to content
Snippets Groups Projects
Commit 2bc0ca46 authored by Joaquim Casals Buñuel's avatar Joaquim Casals Buñuel
Browse files

Added Config file for IMU plugin & fixed gtest include

parent 3d8e4e1e
No related branches found
No related tags found
2 merge requests!39release after RAL,!38After 2nd RAL submission
...@@ -85,6 +85,7 @@ set(BUILD_TESTS true) ...@@ -85,6 +85,7 @@ set(BUILD_TESTS true)
# but for the examples ? # but for the examples ?
# yes, for the tests ! # yes, for the tests !
IF(BUILD_EXAMPLES OR BUILD_TESTS) IF(BUILD_EXAMPLES OR BUILD_TESTS)
string(TOUPPER ${PROJECT_NAME} UPPER_NAME)
set(_WOLF_ROOT_DIR ${CMAKE_SOURCE_DIR}) set(_WOLF_ROOT_DIR ${CMAKE_SOURCE_DIR})
ENDIF(BUILD_EXAMPLES OR BUILD_TESTS) ENDIF(BUILD_EXAMPLES OR BUILD_TESTS)
...@@ -125,7 +126,7 @@ ELSE (Suitesparse_INCLUDE_DIRS) ...@@ -125,7 +126,7 @@ ELSE (Suitesparse_INCLUDE_DIRS)
ENDIF (Suitesparse_INCLUDE_DIRS) ENDIF (Suitesparse_INCLUDE_DIRS)
# Define the directory where will be the configured config.h # Define the directory where will be the configured config.h
SET(WOLF_CONFIG_DIR ${PROJECT_BINARY_DIR}/conf/internal) SET(WOLF_CONFIG_DIR ${PROJECT_BINARY_DIR}/conf/${PROJECT_NAME}/internal)
# Create the specified output directory if it does not exist. # Create the specified output directory if it does not exist.
IF(NOT EXISTS "${WOLF_CONFIG_DIR}") IF(NOT EXISTS "${WOLF_CONFIG_DIR}")
...@@ -146,7 +147,6 @@ include_directories("${PROJECT_BINARY_DIR}/conf") ...@@ -146,7 +147,6 @@ include_directories("${PROJECT_BINARY_DIR}/conf")
INCLUDE_DIRECTORIES(${EIGEN_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${EIGEN_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${wolf_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${wolf_INCLUDE_DIRS})
include_directories(BEFORE "include") include_directories(BEFORE "include")
include_directories(.)
IF(Ceres_FOUND) IF(Ceres_FOUND)
INCLUDE_DIRECTORIES(${CERES_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${CERES_INCLUDE_DIRS})
ENDIF(Ceres_FOUND) ENDIF(Ceres_FOUND)
...@@ -336,7 +336,7 @@ INSTALL(FILES ${PROJECT_NAME}.found ...@@ -336,7 +336,7 @@ INSTALL(FILES ${PROJECT_NAME}.found
FILE(WRITE IMU.found "") FILE(WRITE IMU.found "")
INSTALL(FILES "${WOLF_CONFIG_DIR}/config.h" INSTALL(FILES "${WOLF_CONFIG_DIR}/config.h"
DESTINATION include/iri-algorithms/wolf/internal) DESTINATION include/iri-algorithms/wolf/plugin_${PROJECT_NAME}/${PROJECT_NAME}/internal)
INSTALL(FILES "${CMAKE_SOURCE_DIR}/cmake_modules/${PLUGIN_NAME}Config.cmake" DESTINATION "lib/cmake/${PLUGIN_NAME}") INSTALL(FILES "${CMAKE_SOURCE_DIR}/cmake_modules/${PLUGIN_NAME}Config.cmake" DESTINATION "lib/cmake/${PLUGIN_NAME}")
INSTALL(DIRECTORY ${SPDLOG_INCLUDE_DIRS} DESTINATION "include/iri-algorithms/") INSTALL(DIRECTORY ${SPDLOG_INCLUDE_DIRS} DESTINATION "include/iri-algorithms/")
......
...@@ -24,13 +24,13 @@ ...@@ -24,13 +24,13 @@
// which will be added to the include path for compilation, // which will be added to the include path for compilation,
// and installed with the public wolf headers. // and installed with the public wolf headers.
#ifndef WOLF_INTERNAL_CONFIG_H_ #ifndef WOLF_INTERNAL_${UPPERNAME}_CONFIG_H_
#define WOLF_INTERNAL_CONFIG_H_ #define WOLF_INTERNAL_${UPPERNAME}_CONFIG_H_
#cmakedefine _WOLF_DEBUG #cmakedefine _WOLF_DEBUG
#cmakedefine _WOLF_TRACE #cmakedefine _WOLF_TRACE
#define _WOLF_ROOT_DIR "${_WOLF_ROOT_DIR}" #define _WOLF_${UPPER_NAME}_ROOT_DIR "${_WOLF_ROOT_DIR}"
#endif /* WOLF_INTERNAL_CONFIG_H_ */ #endif /* WOLF_INTERNAL_CONFIG_H_ */
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
//Wolf //Wolf
#include "IMU/capture/capture_IMU.h" #include "IMU/capture/capture_IMU.h"
#include "IMU/sensor/sensor_IMU.h" #include "IMU/sensor/sensor_IMU.h"
#include "test/processor_IMU_UnitTester.h" #include "processor_IMU_UnitTester.h"
#include "core/common/wolf.h" #include "core/common/wolf.h"
#include "core/problem/problem.h" #include "core/problem/problem.h"
#include "core/state_block/state_block.h" #include "core/state_block/state_block.h"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment