diff --git a/.gitignore b/.gitignore index cd7e137f773e8db3658210579cefcf02ee92d933..b4e53703e896e0c36e288c8c4e1e13e71c42ab2d 100644 --- a/.gitignore +++ b/.gitignore @@ -34,12 +34,9 @@ src/examples/map_apriltag_save.yaml \.vscode/ -IMU.found -imu.found .ccls .ccls-cache .ccls-root compile_commands.json .vimspector.json est.csv -/imu.found diff --git a/CMakeLists.txt b/CMakeLists.txt index 5dc35a87041678cea8d4c047a345d7029f69b3ed..3b5bbeb37f671c81572c090ddc8dba575c4f73dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ MESSAGE("Starting ${PROJECT_NAME} CMakeLists ...") # Paths SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin) 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/) IF (NOT CMAKE_BUILD_TYPE) @@ -103,31 +103,31 @@ INCLUDE_DIRECTORIES(BEFORE "include") # ============ HEADERS ============ SET(HDRS_CAPTURE - include/imu/capture/capture_compass.h - include/imu/capture/capture_imu.h + include/${PROJECT_NAME}/capture/capture_compass.h + include/${PROJECT_NAME}/capture/capture_imu.h ) SET(HDRS_FACTOR - include/imu/factor/factor_compass_3d.h - include/imu/factor/factor_imu.h - include/imu/factor/factor_imu2d.h - include/imu/factor/factor_imu2d_with_gravity.h + include/${PROJECT_NAME}/factor/factor_compass_3d.h + include/${PROJECT_NAME}/factor/factor_imu.h + include/${PROJECT_NAME}/factor/factor_imu2d.h + include/${PROJECT_NAME}/factor/factor_imu2d_with_gravity.h ) SET(HDRS_FEATURE - include/imu/feature/feature_imu.h - include/imu/feature/feature_imu2d.h + include/${PROJECT_NAME}/feature/feature_imu.h + include/${PROJECT_NAME}/feature/feature_imu2d.h ) SET(HDRS_MATH - include/imu/math/imu_tools.h + include/${PROJECT_NAME}/math/imu_tools.h ) SET(HDRS_PROCESSOR - include/imu/processor/processor_compass.h - include/imu/processor/processor_imu.h - include/imu/processor/processor_imu2d.h + include/${PROJECT_NAME}/processor/processor_compass.h + include/${PROJECT_NAME}/processor/processor_imu.h + include/${PROJECT_NAME}/processor/processor_imu2d.h ) SET(HDRS_SENSOR - include/imu/sensor/sensor_compass.h - include/imu/sensor/sensor_imu.h - include/imu/sensor/sensor_imu2d.h + include/${PROJECT_NAME}/sensor/sensor_compass.h + include/${PROJECT_NAME}/sensor/sensor_imu.h + include/${PROJECT_NAME}/sensor/sensor_imu2d.h ) # ============ SOURCES ============ @@ -237,8 +237,6 @@ INSTALL(FILES ${HDRS_SENSOR} INSTALL(FILES "${WOLF_CONFIG_DIR}/config.h" DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}/internal) -INSTALL(DIRECTORY ${SPDLOG_INCLUDE_DIRS} DESTINATION "include/iri-algorithms/") - export(PACKAGE ${PLUGIN_NAME}) FIND_PACKAGE(Doxygen MODULE)