Skip to content
Snippets Groups Projects
Commit 27c521ff authored by Mederic Fourmy's avatar Mederic Fourmy
Browse files

Merge branch '27-cmake-remove-iri-algorithms-from-include-install-path' into 'devel'

Resolve "cmake: remove iri-algorithms from include install path"

Closes #27

See merge request !48
parents 7c4ecfff 7c0f6431
No related branches found
No related tags found
2 merge requests!54devel->main,!48Resolve "cmake: remove iri-algorithms from include install path"
...@@ -34,12 +34,9 @@ src/examples/map_apriltag_save.yaml ...@@ -34,12 +34,9 @@ src/examples/map_apriltag_save.yaml
\.vscode/ \.vscode/
IMU.found
imu.found
.ccls .ccls
.ccls-cache .ccls-cache
.ccls-root .ccls-root
compile_commands.json compile_commands.json
.vimspector.json .vimspector.json
est.csv est.csv
/imu.found
...@@ -13,7 +13,7 @@ MESSAGE("Starting ${PROJECT_NAME} CMakeLists ...") ...@@ -13,7 +13,7 @@ MESSAGE("Starting ${PROJECT_NAME} CMakeLists ...")
# Paths # Paths
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin) SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin)
SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib) SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib)
set(INCLUDE_INSTALL_DIR include/iri-algorithms/wolf) set(INCLUDE_INSTALL_DIR include/wolf)
set(LIB_INSTALL_DIR lib/) set(LIB_INSTALL_DIR lib/)
IF (NOT CMAKE_BUILD_TYPE) IF (NOT CMAKE_BUILD_TYPE)
...@@ -103,31 +103,31 @@ INCLUDE_DIRECTORIES(BEFORE "include") ...@@ -103,31 +103,31 @@ INCLUDE_DIRECTORIES(BEFORE "include")
# ============ HEADERS ============ # ============ HEADERS ============
SET(HDRS_CAPTURE SET(HDRS_CAPTURE
include/imu/capture/capture_compass.h include/${PROJECT_NAME}/capture/capture_compass.h
include/imu/capture/capture_imu.h include/${PROJECT_NAME}/capture/capture_imu.h
) )
SET(HDRS_FACTOR SET(HDRS_FACTOR
include/imu/factor/factor_compass_3d.h include/${PROJECT_NAME}/factor/factor_compass_3d.h
include/imu/factor/factor_imu.h include/${PROJECT_NAME}/factor/factor_imu.h
include/imu/factor/factor_imu2d.h include/${PROJECT_NAME}/factor/factor_imu2d.h
include/imu/factor/factor_imu2d_with_gravity.h include/${PROJECT_NAME}/factor/factor_imu2d_with_gravity.h
) )
SET(HDRS_FEATURE SET(HDRS_FEATURE
include/imu/feature/feature_imu.h include/${PROJECT_NAME}/feature/feature_imu.h
include/imu/feature/feature_imu2d.h include/${PROJECT_NAME}/feature/feature_imu2d.h
) )
SET(HDRS_MATH SET(HDRS_MATH
include/imu/math/imu_tools.h include/${PROJECT_NAME}/math/imu_tools.h
) )
SET(HDRS_PROCESSOR SET(HDRS_PROCESSOR
include/imu/processor/processor_compass.h include/${PROJECT_NAME}/processor/processor_compass.h
include/imu/processor/processor_imu.h include/${PROJECT_NAME}/processor/processor_imu.h
include/imu/processor/processor_imu2d.h include/${PROJECT_NAME}/processor/processor_imu2d.h
) )
SET(HDRS_SENSOR SET(HDRS_SENSOR
include/imu/sensor/sensor_compass.h include/${PROJECT_NAME}/sensor/sensor_compass.h
include/imu/sensor/sensor_imu.h include/${PROJECT_NAME}/sensor/sensor_imu.h
include/imu/sensor/sensor_imu2d.h include/${PROJECT_NAME}/sensor/sensor_imu2d.h
) )
# ============ SOURCES ============ # ============ SOURCES ============
...@@ -237,8 +237,6 @@ INSTALL(FILES ${HDRS_SENSOR} ...@@ -237,8 +237,6 @@ INSTALL(FILES ${HDRS_SENSOR}
INSTALL(FILES "${WOLF_CONFIG_DIR}/config.h" INSTALL(FILES "${WOLF_CONFIG_DIR}/config.h"
DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}/internal) DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}/internal)
INSTALL(DIRECTORY ${SPDLOG_INCLUDE_DIRS} DESTINATION "include/iri-algorithms/")
export(PACKAGE ${PLUGIN_NAME}) export(PACKAGE ${PLUGIN_NAME})
FIND_PACKAGE(Doxygen MODULE) FIND_PACKAGE(Doxygen MODULE)
......
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