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
3c7936c1
Commit
3c7936c1
authored
2 years ago
by
Mederic Fourmy
Browse files
Options
Downloads
Patches
Plain Diff
changes done
parent
ab0bcccb
No related branches found
No related tags found
2 merge requests
!466
devel->main
,
!453
Resolve "Cmake correct includes"
Pipeline
#11481
failed
2 years ago
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+5
-10
5 additions, 10 deletions
CMakeLists.txt
with
5 additions
and
10 deletions
CMakeLists.txt
+
5
−
10
View file @
3c7936c1
...
...
@@ -101,14 +101,9 @@ IF(EXISTS "${WOLF_CONFIG_DIR}" AND NOT IS_DIRECTORY "${WOLF_CONFIG_DIR}")
message
(
FATAL_ERROR
"Bug: Specified CONFIG_DIR: "
"
${
WOLF_CONFIG_DIR
}
exists, but is not a directory."
)
ENDIF
()
# Configure config.h
configure_file
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/internal/config.h.in
"
${
WOLF_CONFIG_DIR
}
/config.h"
)
message
(
STATUS
"WOLF CONFIG DIRECTORY
${
WOLF_CONFIG_DIR
}
"
)
message
(
STATUS
"WOLF CONFIG FILE
${
WOLF_CONFIG_DIR
}
/config.h"
)
include_directories
(
"
${
PROJECT_BINARY_DIR
}
/conf"
)
# ============ INCLUDES ============
INCLUDE_DIRECTORIES
(
"include"
)
# In this same project
# ============ HEADERS ============
SET
(
HDRS_CAPTURE
...
...
@@ -450,9 +445,9 @@ install(
${
LIB_INSTALL_DIR
}
/
${
PLUGIN_NAME
}
/cmake
)
# Specifies
include
directories
to use when compiling the plugin target
# This way, include_directories does not need to be called in plugins depending on this one
target_include_directories
(
${
PLUGIN_NAME
}
INTERFACE
target_
include
_
directories
(
${
PLUGIN_NAME
}
PUBLIC
$<BUILD_INTERFACE:
${
CMAKE_CURRENT_SOURCE_DIR
}
/include>
$<BUILD_INTERFACE:
${
PROJECT_BINARY_DIR
}
/conf>
$<INSTALL_INTERFACE:
${
INCLUDE_INSTALL_DIR
}
>
)
...
...
@@ -498,7 +493,7 @@ INSTALL(FILES ${HDRS_UTILS}
INSTALL
(
FILES
${
HDRS_YAML
}
DESTINATION
${
INCLUDE_INSTALL_DIR
}
/
${
PROJECT_NAME
}
/yaml
)
INSTALL
(
FILES
"
${
WOLF_CONFIG_DIR
}
/config.h
"
INSTALL
(
FILES
${
WOLF_CONFIG_DIR
}
/config.h
DESTINATION
${
INCLUDE_INSTALL_DIR
}
/
${
PROJECT_NAME
}
/internal
)
export
(
PACKAGE
${
PLUGIN_NAME
}
)
...
...
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