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
ce7372a3
Verified
Commit
ce7372a3
authored
4 years ago
by
Justin Carpentier
Browse files
Options
Downloads
Patches
Plain Diff
cmake: fix packaging
parent
672a44b5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
examples/CMakeLists.txt
+0
-10
0 additions, 10 deletions
examples/CMakeLists.txt
examples/codegen/CMakeLists.txt
+1
-1
1 addition, 1 deletion
examples/codegen/CMakeLists.txt
unittest/CMakeLists.txt
+2
-10
2 additions, 10 deletions
unittest/CMakeLists.txt
with
3 additions
and
21 deletions
examples/CMakeLists.txt
+
0
−
10
View file @
ce7372a3
...
...
@@ -7,16 +7,6 @@ FUNCTION(ADD_PINOCCHIO_CPP_EXAMPLE EXAMPLE)
SET
(
EXAMPLE_NAME
"example-cpp-
${
EXAMPLE_NAME
}
"
)
ADD_UNIT_TEST
(
${
EXAMPLE_NAME
}
${
EXAMPLE
}
)
TARGET_LINK_LIBRARIES
(
${
EXAMPLE_NAME
}
PUBLIC
${
PROJECT_NAME
}
)
PKG_CONFIG_USE_DEPENDENCY
(
${
EXAMPLE_NAME
}
eigen3
)
IF
(
URDFDOM_FOUND
)
PKG_CONFIG_USE_DEPENDENCY
(
${
EXAMPLE_NAME
}
urdfdom
)
ENDIF
(
URDFDOM_FOUND
)
IF
(
HPP_FCL_FOUND
)
PKG_CONFIG_USE_DEPENDENCY
(
${
EXAMPLE_NAME
}
hpp-fcl
)
ENDIF
(
HPP_FCL_FOUND
)
IF
(
CPPAD_FOUND
)
PKG_CONFIG_USE_DEPENDENCY
(
${
EXAMPLE_NAME
}
"cppad"
)
ENDIF
(
CPPAD_FOUND
)
ENDFUNCTION
()
SET
(
${
PROJECT_NAME
}
_EXAMPLES
...
...
This diff is collapsed.
Click to expand it.
examples/codegen/CMakeLists.txt
+
1
−
1
View file @
ce7372a3
...
...
@@ -5,6 +5,6 @@
IF
(
CPPADCG_FOUND AND BUILD_WITH_CODEGEN_SUPPORT AND BUILD_WITH_URDF_SUPPORT
)
ADD_PINOCCHIO_CPP_EXAMPLE
(
codegen-crba
)
SET_PROPERTY
(
TARGET example-cpp-codegen-crba PROPERTY CXX_STANDARD 11
)
TARGET_LINK_LIBRARIES
(
example-cpp-codegen-crba
${
CMAKE_DL_LIBS
}
)
TARGET_LINK_LIBRARIES
(
example-cpp-codegen-crba
PUBLIC
${
CMAKE_DL_LIBS
}
cppadcg::cppadcg
)
ENDIF
(
CPPADCG_FOUND AND BUILD_WITH_CODEGEN_SUPPORT AND BUILD_WITH_URDF_SUPPORT
)
This diff is collapsed.
Click to expand it.
unittest/CMakeLists.txt
+
2
−
10
View file @
ce7372a3
...
...
@@ -32,17 +32,8 @@ MACRO(ADD_PINOCCHIO_UNIT_TEST NAME)
TARGET_LINK_LIBRARIES
(
${
TEST_NAME
}
PUBLIC
${
PKG
}
::
${
PKG
}
)
ENDFOREACH
(
PKG
)
IF
(
URDFDOM_FOUND
AND
(
UNIX OR
"
${
CMAKE_GENERATOR_TOOLSET
}
"
MATCHES
"ClangCl"
))
TARGET_LINK_LIBRARIES
(
${
TEST_NAME
}
PUBLIC urdfdom::urdfdom
)
ENDIF
(
URDFDOM_FOUND
AND
(
UNIX OR
"
${
CMAKE_GENERATOR_TOOLSET
}
"
MATCHES
"ClangCl"
))
IF
(
HPP_FCL_FOUND
)
TARGET_LINK_LIBRARIES
(
${
TEST_NAME
}
PUBLIC hpp-fcl::hpp-fcl
)
ENDIF
(
HPP_FCL_FOUND
)
TARGET_LINK_LIBRARIES
(
${
TEST_NAME
}
PUBLIC
${
PROJECT_NAME
}
)
TARGET_LINK_LIBRARIES
(
${
TEST_NAME
}
PRIVATE
${
Boost_UNIT_TEST_FRAMEWORK_LIBRARY
}
)
TARGET_LINK_LIBRARIES
(
${
TEST_NAME
}
PRIVATE
${
Boost_FILESYSTEM_LIBRARY
}
)
ENDMACRO
(
ADD_PINOCCHIO_UNIT_TEST
)
# --- RULES -------------------------------------------------------------------
...
...
@@ -147,13 +138,14 @@ ENDIF(BUILD_ADVANCED_TESTING)
MACRO
(
ADD_CPPAD_UNIT_TEST name
)
ADD_PINOCCHIO_UNIT_TEST
(
${
name
}
cppad
)
ADD_DEPENDENCIES
(
test-cppad test-cpp-
${
name
}
)
TARGET_LINK_LIBRARIES
(
test-cpp-
${
name
}
PUBLIC cppad::cppad
)
ENDMACRO
()
MACRO
(
ADD_CPPADCG_UNIT_TEST name
)
ADD_PINOCCHIO_UNIT_TEST
(
${
name
}
cppadcg
)
SET_PROPERTY
(
TARGET test-cpp-
${
name
}
PROPERTY CXX_STANDARD 11
)
ADD_DEPENDENCIES
(
test-cppadcg test-cpp-
${
name
}
)
TARGET_LINK_LIBRARIES
(
test-cpp-
${
name
}
${
CMAKE_DL_LIBS
}
)
TARGET_LINK_LIBRARIES
(
test-cpp-
${
name
}
PUBLIC
${
CMAKE_DL_LIBS
}
cppadcg::cppadcg
)
ENDMACRO
()
IF
(
BUILD_WITH_AUTODIFF_SUPPORT
)
...
...
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