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
ec2a5f5a
Commit
ec2a5f5a
authored
8 years ago
by
Justin Carpentier
Committed by
GitHub
8 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #238 from nmansard/topic/issue236
Solving #236
parents
4c43a837
353bc92e
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
+21
-18
21 additions, 18 deletions
CMakeLists.txt
src/CMakeLists.txt
+9
-12
9 additions, 12 deletions
src/CMakeLists.txt
with
30 additions
and
30 deletions
CMakeLists.txt
+
21
−
18
View file @
ec2a5f5a
...
...
@@ -153,7 +153,6 @@ SET(${PROJECT_NAME}_MULTIBODY_JOINT_HEADERS
multibody/joint/joint-basic-visitors.hxx
)
SET
(
${
PROJECT_NAME
}
_MULTIBODY_HEADERS
multibody/fwd.hpp
multibody/constraint.hpp
...
...
@@ -164,12 +163,6 @@ SET(${PROJECT_NAME}_MULTIBODY_HEADERS
multibody/visitor.hpp
)
SET
(
${
PROJECT_NAME
}
_PARSERS_HEADERS
parsers/sample-models.hpp
parsers/utils.hpp
parsers/srdf.hpp
)
SET
(
${
PROJECT_NAME
}
_ALGORITHM_HEADERS
algorithm/aba.hpp
algorithm/aba.hxx
...
...
@@ -214,19 +207,29 @@ IF(BUILD_PYTHON_INTERFACE)
python/explog.hpp
)
LIST
(
APPEND
${
PROJECT_NAME
}
_PARSERS_HEADERS
parsers/python.hpp
)
ENDIF
(
BUILD_PYTHON_INTERFACE
)
IF
(
HPP_FCL_FOUND AND BUILD_PYTHON_INTERFACE
)
LIST
(
APPEND
${
PROJECT_NAME
}
_PYTHON_HEADERS
IF
(
HPP_FCL_FOUND
)
LIST
(
APPEND
${
PROJECT_NAME
}
_PYTHON_HEADERS
python/geometry-object.hpp
python/geometry-model.hpp
python/geometry-data.hpp
)
ENDIF
(
HPP_FCL_FOUND AND BUILD_PYTHON_INTERFACE
)
)
ENDIF
(
HPP_FCL_FOUND
)
ELSE
(
BUILD_PYTHON_INTERFACE
)
SET
(
${
PROJECT_NAME
}
_PYTHON_HEADERS
""
)
ENDIF
(
BUILD_PYTHON_INTERFACE
)
SET
(
${
PROJECT_NAME
}
_PARSERS_HEADERS
parsers/sample-models.hpp
parsers/utils.hpp
parsers/srdf.hpp
)
IF
(
BUILD_PYTHON_INTERFACE
)
LIST
(
APPEND
${
PROJECT_NAME
}
_PARSERS_HEADERS
parsers/python.hpp
)
ENDIF
(
BUILD_PYTHON_INTERFACE
)
IF
(
URDFDOM_FOUND
)
LIST
(
APPEND
${
PROJECT_NAME
}
_PARSERS_HEADERS
...
...
@@ -235,7 +238,7 @@ IF(URDFDOM_FOUND)
parsers/urdf/utils.hpp
)
IF
(
HPP_FCL_FOUND
)
IF
(
HPP_FCL_FOUND
)
LIST
(
APPEND
${
PROJECT_NAME
}
_PARSERS_HEADERS
parsers/urdf/geometry.hxx
)
...
...
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
9
−
12
View file @
ec2a5f5a
...
...
@@ -52,26 +52,23 @@ SET(${PROJECT_NAME}_PARSERS_SOURCES
)
IF
(
BUILD_PYTHON_INTERFACE
)
SET
(
${
PROJECT_NAME
}
_PARSERS_PYTHON_SOURCES
parsers/python.cpp
)
ENDIF
(
BUILD_PYTHON_INTERFACE
)
SET
(
${
PROJECT_NAME
}
_SOURCES
${${
PROJECT_NAME
}
_MULTIBODY_SOURCES
}
)
IF
(
BUILD_PYTHON_INTERFACE
)
LIST
(
APPEND
${
PROJECT_NAME
}
_SOURCES
${${
PROJECT_NAME
}
_PARSERS_SOURCES
}
${${
PROJECT_NAME
}
_PARSERS_PYTHON_SOURCES
}
)
LIST
(
APPEND
${
PROJECT_NAME
}
_PARSERS_SOURCES
parsers/python.cpp
)
ENDIF
(
BUILD_PYTHON_INTERFACE
)
IF
(
LUA5_1_FOUND
)
SET
(
${
PROJECT_NAME
}
_
MULTIBODY_
PARSER_
LUA_
SOURCES
LIST
(
APPEND
${
PROJECT_NAME
}
_PARSER_SOURCES
parsers/lua/lua_tables.cpp
parsers/lua.cpp
)
LIST
(
APPEND
${
PROJECT_NAME
}
_SOURCES
${${
PROJECT_NAME
}
_MULTIBODY_PARSER_LUA_SOURCES
}
)
ENDIF
(
LUA5_1_FOUND
)
SET
(
${
PROJECT_NAME
}
_SOURCES
${${
PROJECT_NAME
}
_MULTIBODY_SOURCES
}
${${
PROJECT_NAME
}
_PARSERS_SOURCES
}
)
IF
(
UNIX
)
# Create target libpinocchio.so
ADD_LIBRARY
(
${
PROJECT_NAME
}
SHARED
${
HEADERS
}
${${
PROJECT_NAME
}
_SOURCES
}
)
...
...
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