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
030189a8
Commit
030189a8
authored
5 years ago
by
Joseph Mirabel
Browse files
Options
Downloads
Patches
Plain Diff
[CMake] Remove urdfdom flags from pc file.
parent
580b83a1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+0
-20
0 additions, 20 deletions
CMakeLists.txt
src/CMakeLists.txt
+15
-0
15 additions, 0 deletions
src/CMakeLists.txt
with
15 additions
and
20 deletions
CMakeLists.txt
+
0
−
20
View file @
030189a8
...
...
@@ -130,26 +130,6 @@ IF(CASADI_FOUND AND BUILD_WITH_CASADI_SUPPORT)
PKG_CONFIG_APPEND_CFLAGS
(
"-DPINOCCHIO_WITH_CASADI_SUPPORT"
)
ENDIF
(
CASADI_FOUND AND BUILD_WITH_CASADI_SUPPORT
)
# Special care of urdfdom version
IF
(
BUILD_WITH_URDF_SUPPORT
)
IF
(
${
URDFDOM_VERSION
}
VERSION_LESS
"0.3.0"
)
ADD_DEFINITIONS
(
-DPINOCCHIO_URDFDOM_COLLISION_WITH_GROUP_NAME
)
PKG_CONFIG_APPEND_CFLAGS
(
"-DPINOCCHIO_URDFDOM_COLLISION_WITH_GROUP_NAME"
)
ENDIF
(
${
URDFDOM_VERSION
}
VERSION_LESS
"0.3.0"
)
# defines types from version 0.4.0
IF
(
NOT
${
URDFDOM_VERSION
}
VERSION_LESS
"0.4.0"
)
ADD_DEFINITIONS
(
-DPINOCCHIO_URDFDOM_TYPEDEF_SHARED_PTR
)
PKG_CONFIG_APPEND_CFLAGS
(
"-DPINOCCHIO_URDFDOM_TYPEDEF_SHARED_PTR"
)
ENDIF
(
NOT
${
URDFDOM_VERSION
}
VERSION_LESS
"0.4.0"
)
# std::shared_ptr appears from version 1.0.0
IF
(
${
URDFDOM_VERSION
}
VERSION_GREATER
"0.4.2"
)
ADD_DEFINITIONS
(
-DPINOCCHIO_URDFDOM_USE_STD_SHARED_PTR
)
PKG_CONFIG_APPEND_CFLAGS
(
"-DPINOCCHIO_URDFDOM_USE_STD_SHARED_PTR"
)
ENDIF
(
${
URDFDOM_VERSION
}
VERSION_GREATER
"0.4.2"
)
ENDIF
(
BUILD_WITH_URDF_SUPPORT
)
SET
(
BOOST_REQUIRED_COMPONENTS filesystem serialization system
)
SET
(
BOOST_BUILD_COMPONENTS unit_test_framework
)
SET
(
BOOST_OPTIONAL_COMPONENTS
""
)
...
...
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
15
−
0
View file @
030189a8
...
...
@@ -26,7 +26,22 @@ IF(UNIX)
PKG_CONFIG_USE_DEPENDENCY
(
${
PROJECT_NAME
}
eigen3
)
TARGET_LINK_LIBRARIES
(
${
PROJECT_NAME
}
PUBLIC
${
Boost_FILESYSTEM_LIBRARY
}
${
Boost_SYSTEM_LIBRARY
}
${
Boost_SERIALIZATION_LIBRARY
}
)
# Special care of urdfdom version
IF
(
URDFDOM_FOUND
)
IF
(
${
URDFDOM_VERSION
}
VERSION_LESS
"0.3.0"
)
TARGET_COMPILE_DEFINITIONS
(
${
PROJECT_NAME
}
PRIVATE -DPINOCCHIO_URDFDOM_COLLISION_WITH_GROUP_NAME
)
ENDIF
(
${
URDFDOM_VERSION
}
VERSION_LESS
"0.3.0"
)
# defines types from version 0.4.0
IF
(
NOT
${
URDFDOM_VERSION
}
VERSION_LESS
"0.4.0"
)
TARGET_COMPILE_DEFINITIONS
(
${
PROJECT_NAME
}
PRIVATE -DPINOCCHIO_URDFDOM_TYPEDEF_SHARED_PTR
)
ENDIF
(
NOT
${
URDFDOM_VERSION
}
VERSION_LESS
"0.4.0"
)
# std::shared_ptr appears from version 1.0.0
IF
(
${
URDFDOM_VERSION
}
VERSION_GREATER
"0.4.2"
)
TARGET_COMPILE_DEFINITIONS
(
${
PROJECT_NAME
}
PRIVATE -DPINOCCHIO_URDFDOM_USE_STD_SHARED_PTR
)
ENDIF
(
${
URDFDOM_VERSION
}
VERSION_GREATER
"0.4.2"
)
PKG_CONFIG_USE_DEPENDENCY
(
${
PROJECT_NAME
}
urdfdom
)
ENDIF
(
URDFDOM_FOUND
)
...
...
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