Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
wolf
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mobile_robotics
wolf_projects
wolf_lib
wolf
Commits
26867b87
"include/dynamixel_pan_tilt.h" did not exist on "11d0f9497d18d93f48518d8ba12fb7dfbecfbd8d"
Commit
26867b87
authored
6 years ago
by
Joaquim Casals Buñuel
Browse files
Options
Downloads
Patches
Plain Diff
Added missing files install step
parent
d56b50c7
No related branches found
No related tags found
1 merge request
!260
WIP: params autoconf
Pipeline
#2455
failed
6 years ago
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+59
-37
59 additions, 37 deletions
CMakeLists.txt
cmake_modules/Findwolf.cmake
+1
-1
1 addition, 1 deletion
cmake_modules/Findwolf.cmake
cmake_modules/wolfConfig.cmake
+5
-2
5 additions, 2 deletions
cmake_modules/wolfConfig.cmake
with
65 additions
and
40 deletions
CMakeLists.txt
+
59
−
37
View file @
26867b87
...
@@ -285,13 +285,27 @@ include/base/time_stamp.h
...
@@ -285,13 +285,27 @@ include/base/time_stamp.h
include/base/track_matrix.h
include/base/track_matrix.h
include/base/trajectory_base.h
include/base/trajectory_base.h
include/base/wolf.h
include/base/wolf.h
)
include/base/IMU_tools.h
SET
(
HDRS
include/base/local_parametrization_polyline_extreme.h
)
SET
(
HDRS_CAPTURE
include/base/capture/capture_base.h
include/base/capture/capture_buffer.h
include/base/capture/capture_pose.h
include/base/capture/capture_void.h
include/base/capture/capture_motion.h
include/base/capture/capture_motion.h
include/base/capture/capture_GPS_fix.h
include/base/capture/capture_GPS_fix.h
include/base/capture/capture_IMU.h
include/base/capture/capture_IMU.h
include/base/capture/capture_odom_2D.h
include/base/capture/capture_odom_2D.h
include/base/capture/capture_odom_3D.h
include/base/capture/capture_odom_3D.h
include/base/capture/capture_GPS_fix.h
include/base/capture/capture_IMU.h
include/base/capture/capture_odom_2D.h
include/base/capture/capture_odom_3D.h
include/base/capture/capture_velocity.h
include/base/capture/capture_wheel_joint_position.h
)
SET
(
HDRS_CONSTRAINT
include/base/constraint/constraint_block_absolute.h
include/base/constraint/constraint_block_absolute.h
include/base/constraint/constraint_container.h
include/base/constraint/constraint_container.h
include/base/constraint/constraint_corner_2D.h
include/base/constraint/constraint_corner_2D.h
...
@@ -311,41 +325,6 @@ include/base/constraint/constraint_pose_2D.h
...
@@ -311,41 +325,6 @@ include/base/constraint/constraint_pose_2D.h
include/base/constraint/constraint_pose_3D.h
include/base/constraint/constraint_pose_3D.h
include/base/constraint/constraint_quaternion_absolute.h
include/base/constraint/constraint_quaternion_absolute.h
include/base/constraint/constraint_relative_2D_analytic.h
include/base/constraint/constraint_relative_2D_analytic.h
include/base/feature/feature_corner_2D.h
include/base/feature/feature_GPS_fix.h
include/base/feature/feature_GPS_pseudorange.h
include/base/feature/feature_IMU.h
include/base/feature/feature_odom_2D.h
include/base/feature/feature_polyline_2D.h
include/base/IMU_tools.h
include/base/landmark/landmark_corner_2D.h
include/base/landmark/landmark_container.h
include/base/landmark/landmark_line_2D.h
include/base/landmark/landmark_polyline_2D.h
include/base/local_parametrization_polyline_extreme.h
include/base/processor/processor_frame_nearest_neighbor_filter.h
include/base/processor/processor_IMU.h
test/processor_IMU_UnitTester.h
include/base/processor/processor_odom_2D.h
include/base/processor/processor_odom_3D.h
include/base/processor/processor_tracker_feature_dummy.h
include/base/processor/processor_tracker_landmark_dummy.h
include/base/sensor/sensor_camera.h
include/base/sensor/sensor_GPS.h
include/base/sensor/sensor_GPS_fix.h
include/base/sensor/sensor_IMU.h
include/base/sensor/sensor_odom_2D.h
include/base/sensor/sensor_odom_3D.h
)
SET
(
HDRS_CAPTURE
include/base/capture/capture_GPS_fix.h
include/base/capture/capture_IMU.h
include/base/capture/capture_odom_2D.h
include/base/capture/capture_odom_3D.h
include/base/capture/capture_velocity.h
include/base/capture/capture_wheel_joint_position.h
)
SET
(
HDRS_CONSTRAINT
include/base/constraint/constraint_autodiff_trifocal.h
include/base/constraint/constraint_autodiff_trifocal.h
include/base/constraint/constraint_autodiff_distance_3D.h
include/base/constraint/constraint_autodiff_distance_3D.h
include/base/constraint/constraint_AHP.h
include/base/constraint/constraint_AHP.h
...
@@ -368,21 +347,38 @@ include/base/constraint/constraint_pose_2D.h
...
@@ -368,21 +347,38 @@ include/base/constraint/constraint_pose_2D.h
include/base/constraint/constraint_pose_3D.h
include/base/constraint/constraint_pose_3D.h
include/base/constraint/constraint_quaternion_absolute.h
include/base/constraint/constraint_quaternion_absolute.h
include/base/constraint/constraint_relative_2D_analytic.h
include/base/constraint/constraint_relative_2D_analytic.h
include/base/constraint/constraint_analytic.h
include/base/constraint/constraint_autodiff.h
include/base/constraint/constraint_base.h
)
)
SET
(
HDRS_FEATURE
SET
(
HDRS_FEATURE
include/base/feature/feature_corner_2D.h
include/base/feature/feature_corner_2D.h
include/base/feature/feature_GPS_fix.h
include/base/feature/feature_GPS_pseudorange.h
include/base/feature/feature_IMU.h
include/base/feature/feature_odom_2D.h
include/base/feature/feature_polyline_2D.h
include/base/feature/feature_corner_2D.h
include/base/feature/feature_diff_drive.h
include/base/feature/feature_diff_drive.h
include/base/feature/feature_GPS_fix.h
include/base/feature/feature_GPS_fix.h
include/base/feature/feature_GPS_pseudorange.h
include/base/feature/feature_GPS_pseudorange.h
include/base/feature/feature_IMU.h
include/base/feature/feature_IMU.h
include/base/feature/feature_odom_2D.h
include/base/feature/feature_odom_2D.h
include/base/feature/feature_polyline_2D.h
include/base/feature/feature_polyline_2D.h
include/base/feature/feature_base.h
include/base/feature/feature_match.h
include/base/feature/feature_pose.h
)
)
SET
(
HDRS_LANDMARK
SET
(
HDRS_LANDMARK
include/base/landmark/landmark_base.h
include/base/landmark/landmark_match.h
include/base/landmark/landmark_match.h
include/base/landmark/landmark_corner_2D.h
include/base/landmark/landmark_corner_2D.h
include/base/landmark/landmark_container.h
include/base/landmark/landmark_container.h
include/base/landmark/landmark_line_2D.h
include/base/landmark/landmark_line_2D.h
include/base/landmark/landmark_polyline_2D.h
include/base/landmark/landmark_corner_2D.h
include/base/landmark/landmark_container.h
include/base/landmark/landmark_line_2D.h
include/base/landmark/landmark_polyline_2D.h
include/base/landmark/landmark_polyline_2D.h
)
)
SET
(
HDRS_PROCESSOR
SET
(
HDRS_PROCESSOR
...
@@ -395,8 +391,24 @@ include/base/processor/processor_odom_3D.h
...
@@ -395,8 +391,24 @@ include/base/processor/processor_odom_3D.h
include/base/processor/processor_tracker_feature_dummy.h
include/base/processor/processor_tracker_feature_dummy.h
include/base/processor/processor_tracker_landmark.h
include/base/processor/processor_tracker_landmark.h
include/base/processor/processor_tracker_landmark_dummy.h
include/base/processor/processor_tracker_landmark_dummy.h
include/base/processor/processor_frame_nearest_neighbor_filter.h
include/base/processor/processor_IMU.h
include/base/processor/processor_odom_2D.h
include/base/processor/processor_odom_3D.h
include/base/processor/processor_tracker_feature_dummy.h
include/base/processor/processor_tracker_landmark_dummy.h
include/base/processor/processor_factory.h
include/base/processor/new_processor_factory.h
include/base/processor/processor_logging.h
include/base/processor/processor_base.h
include/base/processor/processor_factory.h
include/base/processor/processor_loopclosure_base.h
include/base/processor/processor_motion.h
include/base/processor/processor_tracker_feature.h
include/base/processor/processor_tracker.h
)
)
SET
(
HDRS_SENSOR
SET
(
HDRS_SENSOR
include/base/sensor/sensor_base.h
include/base/sensor/sensor_camera.h
include/base/sensor/sensor_camera.h
include/base/sensor/sensor_diff_drive.h
include/base/sensor/sensor_diff_drive.h
include/base/sensor/sensor_GPS.h
include/base/sensor/sensor_GPS.h
...
@@ -404,6 +416,14 @@ include/base/sensor/sensor_GPS_fix.h
...
@@ -404,6 +416,14 @@ include/base/sensor/sensor_GPS_fix.h
include/base/sensor/sensor_IMU.h
include/base/sensor/sensor_IMU.h
include/base/sensor/sensor_odom_2D.h
include/base/sensor/sensor_odom_2D.h
include/base/sensor/sensor_odom_3D.h
include/base/sensor/sensor_odom_3D.h
include/base/sensor/sensor_camera.h
include/base/sensor/sensor_GPS.h
include/base/sensor/sensor_GPS_fix.h
include/base/sensor/sensor_IMU.h
include/base/sensor/sensor_odom_2D.h
include/base/sensor/sensor_odom_3D.h
include/base/sensor/sensor_factory.h
include/base/sensor/new_sensor_factory.h
)
)
SET
(
HDRS_SOLVER
SET
(
HDRS_SOLVER
include/base/solver/solver_manager.h
include/base/solver/solver_manager.h
...
@@ -762,6 +782,8 @@ INSTALL(FILES ${HDRS_SENSOR}
...
@@ -762,6 +782,8 @@ INSTALL(FILES ${HDRS_SENSOR}
DESTINATION include/iri-algorithms/wolf/base/sensor
)
DESTINATION include/iri-algorithms/wolf/base/sensor
)
INSTALL
(
FILES
${
HDRS_PROCESSOR
}
INSTALL
(
FILES
${
HDRS_PROCESSOR
}
DESTINATION include/iri-algorithms/wolf/base/processor
)
DESTINATION include/iri-algorithms/wolf/base/processor
)
INSTALL
(
FILES
${
HDRS_LANDMARK
}
DESTINATION include/iri-algorithms/wolf/base/landmark
)
INSTALL
(
FILES
${
HDRS_WRAPPER
}
INSTALL
(
FILES
${
HDRS_WRAPPER
}
DESTINATION include/iri-algorithms/wolf/base/ceres_wrapper
)
DESTINATION include/iri-algorithms/wolf/base/ceres_wrapper
)
INSTALL
(
FILES
${
HDRS_SOLVER_SUITESPARSE
}
INSTALL
(
FILES
${
HDRS_SOLVER_SUITESPARSE
}
...
...
This diff is collapsed.
Click to expand it.
cmake_modules/Findwolf.cmake
+
1
−
1
View file @
26867b87
#edit the following line to add the librarie's header files
#edit the following line to add the librarie's header files
FIND_PATH
(
FIND_PATH
(
wolf_INCLUDE_DIRS
wolf_INCLUDE_DIRS
NAMES wolf.h
#
NAMES wolf.h
PATHS /usr/local/include/iri-algorithms/wolf
)
PATHS /usr/local/include/iri-algorithms/wolf
)
#change INCLUDE_DIRS to its parent directory
#change INCLUDE_DIRS to its parent directory
get_filename_component
(
wolf_INCLUDE_DIRS
${
wolf_INCLUDE_DIRS
}
DIRECTORY
)
get_filename_component
(
wolf_INCLUDE_DIRS
${
wolf_INCLUDE_DIRS
}
DIRECTORY
)
...
...
This diff is collapsed.
Click to expand it.
cmake_modules/wolfConfig.cmake
+
5
−
2
View file @
26867b87
...
@@ -17,6 +17,7 @@
...
@@ -17,6 +17,7 @@
# specific prior written permission.
# specific prior written permission.
#
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
...
@@ -129,14 +130,16 @@ endif (NOT EXISTS ${CURRENT_ROOT_INSTALL_DIR})
...
@@ -129,14 +130,16 @@ endif (NOT EXISTS ${CURRENT_ROOT_INSTALL_DIR})
# Set the include directories for wolf (itself).
# Set the include directories for wolf (itself).
set
(
wolf_INCLUDE_DIR
"
${
CURRENT_ROOT_INSTALL_DIR
}
/include/iri-algorithms"
)
set
(
wolf_INCLUDE_DIR
"
${
CURRENT_ROOT_INSTALL_DIR
}
/include/iri-algorithms"
)
if
(
NOT EXISTS
${
wolf_INCLUDE_DIR
}
/wolf/wolf.h
)
# if (NOT EXISTS ${wolf_INCLUDE_DIR}/wolf/wolf.h)
if
(
NOT EXISTS
${
wolf_INCLUDE_DIR
}
/wolf
)
wolf_report_not_found
(
wolf_report_not_found
(
"wolf install root:
${
CURRENT_ROOT_INSTALL_DIR
}
, "
"wolf install root:
${
CURRENT_ROOT_INSTALL_DIR
}
, "
"determined from relative path from wolfConfig.cmake install location: "
"determined from relative path from wolfConfig.cmake install location: "
"
${
wolf_CURRENT_CONFIG_DIR
}
, does not contain wolf headers. "
"
${
wolf_CURRENT_CONFIG_DIR
}
, does not contain wolf headers. "
"Either the install directory was deleted, or the install tree was only "
"Either the install directory was deleted, or the install tree was only "
"partially relocated outside of CMake after wolf was built."
)
"partially relocated outside of CMake after wolf was built."
)
endif
(
NOT EXISTS
${
wolf_INCLUDE_DIR
}
/wolf/wolf.h
)
# endif (NOT EXISTS ${wolf_INCLUDE_DIR}/wolf/wolf.h)
endif
(
NOT EXISTS
${
wolf_INCLUDE_DIR
}
/wolf
)
list
(
APPEND wolf_INCLUDE_DIRS
${
wolf_INCLUDE_DIR
}
)
list
(
APPEND wolf_INCLUDE_DIRS
${
wolf_INCLUDE_DIR
}
)
# Set the version.
# Set the version.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment