Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
gnss
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
gnss
Commits
9d834959
Commit
9d834959
authored
3 years ago
by
Mederic Fourmy
Browse files
Options
Downloads
Patches
Plain Diff
[skip ci] Fix includes installation path: wolf_ros_gnss compiles against gnss
parent
29e58c6b
No related branches found
No related tags found
2 merge requests
!35
After cmake and const refactor
,
!34
Resolve "Adapt to core CMakeLists.txt refactor"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+7
-11
7 additions, 11 deletions
CMakeLists.txt
cmake_modules/wolfgnssConfig.cmake.in
+4
-0
4 additions, 0 deletions
cmake_modules/wolfgnssConfig.cmake.in
with
11 additions
and
11 deletions
CMakeLists.txt
+
7
−
11
View file @
9d834959
...
@@ -197,7 +197,6 @@ INSTALL(TARGETS ${PLUGIN_NAME} EXPORT ${PLUGIN_NAME}Targets
...
@@ -197,7 +197,6 @@ INSTALL(TARGETS ${PLUGIN_NAME} EXPORT ${PLUGIN_NAME}Targets
)
)
install
(
EXPORT
${
PLUGIN_NAME
}
Targets DESTINATION lib/
${
PLUGIN_NAME
}
/cmake
)
install
(
EXPORT
${
PLUGIN_NAME
}
Targets DESTINATION lib/
${
PLUGIN_NAME
}
/cmake
)
# Configure the package installation
# Configure the package installation
include
(
CMakePackageConfigHelpers
)
include
(
CMakePackageConfigHelpers
)
configure_package_config_file
(
configure_package_config_file
(
...
@@ -222,23 +221,20 @@ target_include_directories(${PLUGIN_NAME} INTERFACE
...
@@ -222,23 +221,20 @@ target_include_directories(${PLUGIN_NAME} INTERFACE
#install headers
#install headers
INSTALL
(
FILES
${
HDRS_CAPTURE
}
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
}
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
}
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_PROCESSOR
}
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
}
INSTALL
(
FILES
${
HDRS_SENSOR
}
DESTINATION
include/iri-algorithms/wolf/plugin_
${
PROJECT_NAME
}
/
${
PROJECT_NAME
}
/sensor
)
DESTINATION
${
INCLUDE_INSTALL_DIR
}
/
${
PROJECT_NAME
}
/sensor
)
INSTALL
(
FILES
${
HDRS_TREE_MANAGER
}
INSTALL
(
FILES
${
HDRS_TREE_MANAGER
}
DESTINATION
include/iri-algorithms/wolf/plugin_
${
PROJECT_NAME
}
/
${
PROJECT_NAME
}
/tree_manager
)
DESTINATION
${
INCLUDE_INSTALL_DIR
}
/
${
PROJECT_NAME
}
/tree_manager
)
FILE
(
WRITE
${
PROJECT_NAME
}
.found
""
)
INSTALL
(
FILES
${
PROJECT_NAME
}
.found
DESTINATION include/iri-algorithms/wolf/plugin_
${
PROJECT_NAME
}
)
INSTALL
(
FILES
"
${
WOLF_CONFIG_DIR
}
/config.h"
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
)
INSTALL
(
DIRECTORY
${
SPDLOG_INCLUDE_DIRS
}
DESTINATION
"include/iri-algorithms/"
)
INSTALL
(
DIRECTORY
${
SPDLOG_INCLUDE_DIRS
}
DESTINATION
"include/iri-algorithms/"
)
...
...
This diff is collapsed.
Click to expand it.
cmake_modules/wolfgnssConfig.cmake.in
+
4
−
0
View file @
9d834959
...
@@ -8,6 +8,10 @@ set(@PLUGIN_NAME@_INCLUDE_DIRS @PLUGIN_NAME@_INCLUDE_DIR)
...
@@ -8,6 +8,10 @@ set(@PLUGIN_NAME@_INCLUDE_DIRS @PLUGIN_NAME@_INCLUDE_DIR)
set_and_check(@PLUGIN_NAME@_LIB_INSTALL_DIR "@PACKAGE_LIB_INSTALL_DIR@")
set_and_check(@PLUGIN_NAME@_LIB_INSTALL_DIR "@PACKAGE_LIB_INSTALL_DIR@")
set(@PLUGIN_NAME@_LIB_INSTALL_DIRS @PLUGIN_NAME@_LIB_INSTALL_DIR)
set(@PLUGIN_NAME@_LIB_INSTALL_DIRS @PLUGIN_NAME@_LIB_INSTALL_DIR)
# forwards the correct parameters given to FIND_DEPENDENCIES
include(CMakeFindDependencyMacro)
FIND_DEPENDENCY(gnss_utils REQUIRED)
include("${CMAKE_CURRENT_LIST_DIR}/@PLUGIN_NAME@Targets.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/@PLUGIN_NAME@Targets.cmake")
check_required_components(@PLUGIN_NAME@)
check_required_components(@PLUGIN_NAME@)
\ No newline at end of file
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