Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Stack Of Tasks
pinocchio
Commits
a87a0719
Verified
Commit
a87a0719
authored
May 11, 2020
by
Francois Keith
Committed by
Justin Carpentier
Jun 03, 2020
Browse files
Clang + windows
parent
834416ad
Changes
3
Hide whitespace changes
Inline
Side-by-side
examples/CMakeLists.txt
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
}
)
...
...
src/CMakeLists.txt
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"
)
unittest/CMakeLists.txt
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
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment