Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
pinocchio
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
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
Stack Of Tasks
pinocchio
Commits
86d34b1d
Commit
86d34b1d
authored
8 years ago
by
Justin Carpentier
Committed by
GitHub
8 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #293 from jcarpent/devel
Append cflags to the .pc file
parents
28ff6f66
0ab1f8aa
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+12
-1
12 additions, 1 deletion
CMakeLists.txt
with
12 additions
and
1 deletion
CMakeLists.txt
+
12
−
1
View file @
86d34b1d
...
...
@@ -105,6 +105,9 @@ ENDIF(BUILD_PYTHON_INTERFACE)
SEARCH_FOR_BOOST
()
# Variable containing all the cflags definition relative to optional dependencies
SET
(
CFLAGS_DEPENDENCIES
)
# Path to boost headers
INCLUDE_DIRECTORIES
(
${
Boost_INCLUDE_DIRS
}
)
...
...
@@ -243,8 +246,8 @@ IF(URDFDOM_FOUND)
parsers/urdf/utils.hpp
)
ADD_DEFINITIONS
(
-DWITH_URDFDOM
)
LIST
(
APPEND CFLAGS_DEPENDENCIES
"-DWITH_URDFDOM"
)
ENDIF
(
URDFDOM_FOUND
)
LIST
(
APPEND
${
PROJECT_NAME
}
_MULTIBODY_HEADERS
...
...
@@ -261,6 +264,9 @@ IF(HPP_FCL_FOUND)
LIST
(
APPEND
${
PROJECT_NAME
}
_SPATIAL_HEADERS
spatial/fcl-pinocchio-conversions.hpp
)
ADD_DEFINITIONS
(
-DWITH_HPP_FCL
)
LIST
(
APPEND CFLAGS_DEPENDENCIES
"-DWITH_HPP_FCL"
)
ENDIF
(
HPP_FCL_FOUND
)
IF
(
LUA5_1_FOUND
)
...
...
@@ -270,6 +276,7 @@ IF(LUA5_1_FOUND)
)
ADD_DEFINITIONS
(
-DWITH_LUA
)
LIST
(
APPEND CFLAGS_DEPENDENCIES
"-DWITH_LUA"
)
ENDIF
(
LUA5_1_FOUND
)
...
...
@@ -330,4 +337,8 @@ IF(URDFDOM_COLLISION_WITH_GROUP_NAME)
PKG_CONFIG_APPEND_CFLAGS
(
"-DURDFDOM_COLLISION_WITH_GROUP_NAME"
)
ENDIF
(
URDFDOM_COLLISION_WITH_GROUP_NAME
)
FOREACH
(
cflags
${
CFLAGS_DEPENDENCIES
}
)
PKG_CONFIG_APPEND_CFLAGS
(
${
cflags
}
)
ENDFOREACH
(
cflags
${
CFLAGS_DEPENDENCIES
}
)
SETUP_PROJECT_FINALIZE
()
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