Merge branch '19-fix-a-few-issues-regarding-cmake-refactoring' into 'devel'

Resolve "fix a few issues regarding cmake refactoring"

Closes #19

See merge request !24

.gitignore

@@ -33,5 +33,3 @@ src/CMakeFiles/cmake.check_cache
 src/examples/map_apriltag_save.yaml
 
 \.vscode/
-
-wolf.found

CMakeLists.txt

@@ -12,7 +12,7 @@ MESSAGE("Starting ${PROJECT_NAME} CMakeLists ...")
 
 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)
@@ -102,35 +102,35 @@ INCLUDE_DIRECTORIES(BEFORE "include")
 
 # ============ HEADERS ============ 
 SET(HDRS_MATH
-include/bodydynamics/math/force_torque_delta_tools.h
+include/${PROJECT_NAME}/math/force_torque_delta_tools.h
   )
 SET(HDRS_CAPTURE
-include/bodydynamics/capture/capture_force_torque_preint.h
-include/bodydynamics/capture/capture_inertial_kinematics.h
-include/bodydynamics/capture/capture_leg_odom.h
-include/bodydynamics/capture/capture_point_feet_nomove.h
+include/${PROJECT_NAME}/capture/capture_force_torque_preint.h
+include/${PROJECT_NAME}/capture/capture_inertial_kinematics.h
+include/${PROJECT_NAME}/capture/capture_leg_odom.h
+include/${PROJECT_NAME}/capture/capture_point_feet_nomove.h
   )
 SET(HDRS_FACTOR
-include/bodydynamics/factor/factor_force_torque.h
-include/bodydynamics/factor/factor_force_torque_preint.h
-include/bodydynamics/factor/factor_inertial_kinematics.h
-include/bodydynamics/factor/factor_point_feet_nomove.h
-include/bodydynamics/factor/factor_point_feet_altitude.h
+include/${PROJECT_NAME}/factor/factor_force_torque.h
+include/${PROJECT_NAME}/factor/factor_force_torque_preint.h
+include/${PROJECT_NAME}/factor/factor_inertial_kinematics.h
+include/${PROJECT_NAME}/factor/factor_point_feet_nomove.h
+include/${PROJECT_NAME}/factor/factor_point_feet_altitude.h
   )
 SET(HDRS_FEATURE
-include/bodydynamics/feature/feature_force_torque.h
-include/bodydynamics/feature/feature_force_torque_preint.h
-include/bodydynamics/feature/feature_inertial_kinematics.h
+include/${PROJECT_NAME}/feature/feature_force_torque.h
+include/${PROJECT_NAME}/feature/feature_force_torque_preint.h
+include/${PROJECT_NAME}/feature/feature_inertial_kinematics.h
   )
 SET(HDRS_PROCESSOR
-include/bodydynamics/processor/processor_force_torque_preint.h
-include/bodydynamics/processor/processor_inertial_kinematics.h
-include/bodydynamics/processor/processor_point_feet_nomove.h
+include/${PROJECT_NAME}/processor/processor_force_torque_preint.h
+include/${PROJECT_NAME}/processor/processor_inertial_kinematics.h
+include/${PROJECT_NAME}/processor/processor_point_feet_nomove.h
   )
 SET(HDRS_SENSOR
-include/bodydynamics/sensor/sensor_force_torque.h
-include/bodydynamics/sensor/sensor_inertial_kinematics.h
-include/bodydynamics/sensor/sensor_point_feet_nomove.h
+include/${PROJECT_NAME}/sensor/sensor_force_torque.h
+include/${PROJECT_NAME}/sensor/sensor_inertial_kinematics.h
+include/${PROJECT_NAME}/sensor/sensor_point_feet_nomove.h
   )
 
 # ============ SOURCES ============ 
@@ -229,20 +229,20 @@ target_include_directories(${PLUGIN_NAME} INTERFACE
 
 #install headers
 INSTALL(FILES ${HDRS_CAPTURE}
-   DESTINATION include/iri-algorithms/wolf/plugin_${PROJECT_NAME}/${PROJECT_NAME}/capture)
+   DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}/capture)
 INSTALL(FILES ${HDRS_FACTOR}
-  DESTINATION include/iri-algorithms/wolf/plugin_${PROJECT_NAME}/${PROJECT_NAME}/factor)
+  DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}/factor)
 INSTALL(FILES ${HDRS_FEATURE}
-  DESTINATION include/iri-algorithms/wolf/plugin_${PROJECT_NAME}/${PROJECT_NAME}/feature)
+  DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}/feature)
 INSTALL(FILES ${HDRS_MATH}
-  DESTINATION include/iri-algorithms/wolf/plugin_${PROJECT_NAME}/${PROJECT_NAME}/math)
+  DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}/math)
 INSTALL(FILES ${HDRS_PROCESSOR}
-  DESTINATION include/iri-algorithms/wolf/plugin_${PROJECT_NAME}/${PROJECT_NAME}/processor)
+  DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}/processor)
 INSTALL(FILES ${HDRS_SENSOR}
-  DESTINATION include/iri-algorithms/wolf/plugin_${PROJECT_NAME}/${PROJECT_NAME}/sensor)
+  DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}/sensor)
 
 INSTALL(FILES "${WOLF_CONFIG_DIR}/config.h"
-DESTINATION include/iri-algorithms/wolf/plugin_${PROJECT_NAME}/${PROJECT_NAME}/internal)
+DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}/internal)
 
 export(PACKAGE ${PLUGIN_NAME})