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
a87a0719
Verified
Commit
a87a0719
authored
4 years ago
by
Francois Keith
Committed by
Justin Carpentier
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Clang + windows
parent
834416ad
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
examples/CMakeLists.txt
+4
-0
4 additions, 0 deletions
examples/CMakeLists.txt
src/CMakeLists.txt
+6
-3
6 additions, 3 deletions
src/CMakeLists.txt
unittest/CMakeLists.txt
+14
-4
14 additions, 4 deletions
unittest/CMakeLists.txt
with
24 additions
and
7 deletions
examples/CMakeLists.txt
+
4
−
0
View file @
a87a0719
...
...
@@ -56,6 +56,10 @@ ENDIF(HPP_FCL_FOUND)
ADD_DEFINITIONS
(
-DPINOCCHIO_MODEL_DIR=
"
${
PINOCCHIO_MODEL_DIR
}
"
)
IF
(
WIN32
)
ADD_DEFINITIONS
(
"-DNOMINMAX -D_USE_MATH_DEFINES"
)
ENDIF
(
WIN32
)
FOREACH
(
EXAMPLE
${${
PROJECT_NAME
}
_EXAMPLES
}
)
ADD_PINOCCHIO_CPP_EXAMPLE
(
${
EXAMPLE
}
)
ENDFOREACH
(
EXAMPLE
${${
PROJECT_NAME
}
_EXAMPLES
}
)
...
...
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
6
−
3
View file @
a87a0719
...
...
@@ -17,7 +17,7 @@ ENDIF()
# Extract the compile definitions of the project for export
GET_DIRECTORY_PROPERTY
(
CURRENT_COMPILE_DEFINITIONS COMPILE_DEFINITIONS
)
IF
(
UNIX
)
IF
(
UNIX
OR
"
${
CMAKE_GENERATOR_TOOLSET
}
"
MATCHES
"ClangCl"
)
# Create target libpinocchio.so
ADD_LIBRARY
(
${
PROJECT_NAME
}
SHARED
${
HEADERS
}
${${
PROJECT_NAME
}
_SOURCES
}
)
SET_TARGET_PROPERTIES
(
${
PROJECT_NAME
}
PROPERTIES LINKER_LANGUAGE CXX
)
...
...
@@ -58,8 +58,11 @@ IF(UNIX)
ADD_HEADER_GROUP
(
HEADERS
)
ADD_SOURCE_GROUP
(
${
PROJECT_NAME
}
_SOURCES
)
INSTALL
(
TARGETS
${
PROJECT_NAME
}
# IF(UNIX)
INSTALL
(
TARGETS
${
PROJECT_NAME
}
EXPORT
${
TARGETS_EXPORT_NAME
}
DESTINATION lib
)
ENDIF
(
UNIX
)
# ENDIF(UNIX)
ENDIF
(
UNIX OR
"
${
CMAKE_GENERATOR_TOOLSET
}
"
MATCHES
"ClangCl"
)
This diff is collapsed.
Click to expand it.
unittest/CMakeLists.txt
+
14
−
4
View file @
a87a0719
...
...
@@ -23,19 +23,29 @@ MACRO(ADD_PINOCCHIO_UNIT_TEST NAME)
SET
(
MODULE_NAME
"
${
NAME
}
Test"
)
STRING
(
REGEX REPLACE
"-"
"_"
MODULE_NAME
${
MODULE_NAME
}
)
ADD_TEST_CFLAGS
(
${
NAME
}
"-DBOOST_TEST_MODULE=
${
MODULE_NAME
}
"
)
ADD_TEST_CFLAGS
(
${
NAME
}
'-DPINOCCHIO_MODEL_DIR=\\\"
${
PINOCCHIO_MODEL_DIR
}
\\\"'
)
ADD_TEST_CFLAGS
(
${
NAME
}
"-DPINOCCHIO_MODEL_DIR=
\\\\\"
${
PINOCCHIO_MODEL_DIR
}
\\\\\"
"
)
IF
(
WIN32
)
ADD_TEST_CFLAGS
(
${
NAME
}
"-DNOMINMAX -D_USE_MATH_DEFINES"
)
ENDIF
(
WIN32
)
PKG_CONFIG_USE_DEPENDENCY
(
${
TEST_NAME
}
eigen3
)
FOREACH
(
PKG
${
PKGS
}
)
PKG_CONFIG_USE_DEPENDENCY
(
${
TEST_NAME
}
${
PKG
}
)
ENDFOREACH
(
PKG
)
IF
(
URDFDOM_FOUND
AND
(
UNIX OR
"
${
CMAKE_GENERATOR_TOOLSET
}
"
MATCHES
"ClangCl"
))
PKG_CONFIG_USE_DEPENDENCY
(
${
TEST_NAME
}
urdfdom
)
ENDIF
(
URDFDOM_FOUND
AND
(
UNIX OR
"
${
CMAKE_GENERATOR_TOOLSET
}
"
MATCHES
"ClangCl"
))
IF
(
HPP_FCL_FOUND
)
PKG_CONFIG_USE_DEPENDENCY
(
${
TEST_NAME
}
hpp-fcl
)
ENDIF
(
HPP_FCL_FOUND
)
TARGET_LINK_LIBRARIES
(
${
TEST_NAME
}
PUBLIC
${
PROJECT_NAME
}
)
# IF(NOT WIN32)
TARGET_LINK_LIBRARIES
(
${
TEST_NAME
}
PUBLIC
${
PROJECT_NAME
}
)
# ENDIF(NOT WIN32)
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 -------------------------------------------------------------------
...
...
@@ -120,7 +130,7 @@ ADD_PINOCCHIO_UNIT_TEST(version)
ADD_PINOCCHIO_UNIT_TEST
(
copy
)
MAKE_DIRECTORY
(
"
${
CMAKE_CURRENT_BINARY_DIR
}
/serialization-data"
)
ADD_PINOCCHIO_UNIT_TEST
(
serialization
)
ADD_TEST_CFLAGS
(
serialization
'
-DTEST_SERIALIZATION_FOLDER=\\\"
${
CMAKE_CURRENT_BINARY_DIR
}
/serialization-data\\\"
'
)
ADD_TEST_CFLAGS
(
serialization
"
-DTEST_SERIALIZATION_FOLDER=
\\\
\\
"
${
CMAKE_CURRENT_BINARY_DIR
}
/serialization-data
\\\
\\"
"
)
# Derivatives algo
ADD_PINOCCHIO_UNIT_TEST
(
kinematics-derivatives
)
...
...
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