Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
laser
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor 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
plugins
laser
Commits
a42a731b
Commit
a42a731b
authored
6 years ago
by
Joaquim Casals Buñuel
Browse files
Options
Downloads
Patches
Plain Diff
Fixed include path ambiguity
parent
f4576635
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+15
-15
15 additions, 15 deletions
CMakeLists.txt
cmake_modules/Findwolf.cmake
+2
-2
2 additions, 2 deletions
cmake_modules/Findwolf.cmake
with
17 additions
and
17 deletions
CMakeLists.txt
+
15
−
15
View file @
a42a731b
...
...
@@ -303,37 +303,37 @@ INSTALL(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets
install
(
EXPORT
${
PROJECT_NAME
}
Targets DESTINATION lib/cmake/
${
PROJECT_NAME
}
)
#install headers
INSTALL
(
FILES
${
HDRS_STATE_BLOCK
}
DESTINATION include/iri-algorithms/wolf/
${
PROJECT_NAME
}
/state_block
)
DESTINATION include/iri-algorithms/wolf/
plugin_
${
PROJECT_NAME
}
/
${
PROJECT_NAME
}
/state_block
)
INSTALL
(
FILES
${
HDRS_DTASSC
}
DESTINATION include/iri-algorithms/wolf/
${
PROJECT_NAME
}
/association
)
DESTINATION include/iri-algorithms/wolf/
plugin_
${
PROJECT_NAME
}
/
${
PROJECT_NAME
}
/association
)
INSTALL
(
FILES
${
HDRS_CAPTURE
}
DESTINATION include/iri-algorithms/wolf/
${
PROJECT_NAME
}
/capture
)
DESTINATION include/iri-algorithms/wolf/
plugin_
${
PROJECT_NAME
}
/
${
PROJECT_NAME
}
/capture
)
INSTALL
(
FILES
${
HDRS_FACTOR
}
DESTINATION include/iri-algorithms/wolf/
${
PROJECT_NAME
}
/factor
)
DESTINATION include/iri-algorithms/wolf/
plugin_
${
PROJECT_NAME
}
/
${
PROJECT_NAME
}
/factor
)
INSTALL
(
FILES
${
HDRS_FEATURE
}
DESTINATION include/iri-algorithms/wolf/
${
PROJECT_NAME
}
/feature
)
DESTINATION include/iri-algorithms/wolf/
plugin_
${
PROJECT_NAME
}
/
${
PROJECT_NAME
}
/feature
)
INSTALL
(
FILES
${
HDRS_SENSOR
}
DESTINATION include/iri-algorithms/wolf/
${
PROJECT_NAME
}
/sensor
)
DESTINATION include/iri-algorithms/wolf/
plugin_
${
PROJECT_NAME
}
/
${
PROJECT_NAME
}
/sensor
)
INSTALL
(
FILES
${
HDRS_PROCESSOR
}
DESTINATION include/iri-algorithms/wolf/
${
PROJECT_NAME
}
/processor
)
DESTINATION include/iri-algorithms/wolf/
plugin_
${
PROJECT_NAME
}
/
${
PROJECT_NAME
}
/processor
)
INSTALL
(
FILES
${
HDRS_LANDMARK
}
DESTINATION include/iri-algorithms/wolf/
${
PROJECT_NAME
}
/landmark
)
DESTINATION include/iri-algorithms/wolf/
plugin_
${
PROJECT_NAME
}
/
${
PROJECT_NAME
}
/landmark
)
INSTALL
(
FILES
${
HDRS_WRAPPER
}
DESTINATION include/iri-algorithms/wolf/
${
PROJECT_NAME
}
/ceres_wrapper
)
DESTINATION include/iri-algorithms/wolf/
plugin_
${
PROJECT_NAME
}
/
${
PROJECT_NAME
}
/ceres_wrapper
)
INSTALL
(
FILES
${
HDRS_SOLVER_SUITESPARSE
}
DESTINATION include/iri-algorithms/wolf/
${
PROJECT_NAME
}
/solver_suitesparse
)
DESTINATION include/iri-algorithms/wolf/
plugin_
${
PROJECT_NAME
}
/
${
PROJECT_NAME
}
/solver_suitesparse
)
INSTALL
(
FILES
${
HDRS_SOLVER
}
DESTINATION include/iri-algorithms/wolf/
${
PROJECT_NAME
}
/solver
)
DESTINATION include/iri-algorithms/wolf/
plugin_
${
PROJECT_NAME
}
/
${
PROJECT_NAME
}
/solver
)
INSTALL
(
FILES
${
HDRS_SERIALIZATION
}
DESTINATION include/iri-algorithms/wolf/
${
PROJECT_NAME
}
/serialization
)
DESTINATION include/iri-algorithms/wolf/
plugin_
${
PROJECT_NAME
}
/
${
PROJECT_NAME
}
/serialization
)
INSTALL
(
FILES
${
HDRS_YAML
}
DESTINATION include/iri-algorithms/wolf/
${
PROJECT_NAME
}
/yaml
)
DESTINATION include/iri-algorithms/wolf/
plugin_
${
PROJECT_NAME
}
/
${
PROJECT_NAME
}
/yaml
)
INSTALL
(
FILES laser.found
DESTINATION include/iri-algorithms/wolf/plugin_
${
PROJECT_NAME
}
)
INSTALL
(
FILES
"
${
CMAKE_SOURCE_DIR
}
/cmake_modules/Findwolf
${
PROJECT_NAME
}
.cmake"
DESTINATION
"lib/cmake/wolf
${
PROJECT_NAME
}
"
)
FILE
(
WRITE laser.found
""
)
INSTALL
(
FILES laser.found
DESTINATION include/iri-algorithms/wolf/
${
PROJECT_NAME
}
)
#install Find*.cmake
configure_file
(
"
${
CMAKE_SOURCE_DIR
}
/cmake_modules/wolf
${
PROJECT_NAME
}
Config.cmake"
"
${
CMAKE_BINARY_DIR
}
/wolf
${
PROJECT_NAME
}
Config.cmake"
@ONLY
)
...
...
This diff is collapsed.
Click to expand it.
cmake_modules/Findwolf.cmake
+
2
−
2
View file @
a42a731b
...
...
@@ -2,9 +2,9 @@
FIND_PATH
(
wolf_INCLUDE_DIRS
NAMES wolf.found
PATHS /usr/local/include/iri-algorithms/wolf/
bas
e
)
PATHS /usr/local/include/iri-algorithms/wolf/
plugin_cor
e
)
#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)
MESSAGE
(
"Found wolf include dirs:
${
wolf_INCLUDE_DIRS
}
"
)
FIND_LIBRARY
(
...
...
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