Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
E
eigenpy
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
eigenpy
Commits
2f73fce0
Unverified
Commit
2f73fce0
authored
5 years ago
by
Justin Carpentier
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #175 from jcarpent/devel
Fix packaging
parents
319b4ed2
a630dc92
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
CMakeLists.txt
+3
-5
3 additions, 5 deletions
CMakeLists.txt
cmake
+1
-1
1 addition, 1 deletion
cmake
include/eigenpy/quaternion.hpp
+1
-1
1 addition, 1 deletion
include/eigenpy/quaternion.hpp
with
5 additions
and
7 deletions
CMakeLists.txt
+
3
−
5
View file @
2f73fce0
...
@@ -168,7 +168,8 @@ TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME}
...
@@ -168,7 +168,8 @@ TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME}
${
EIGEN3_INCLUDE_DIRS
}
${
EIGEN3_INCLUDE_DIRS
}
${
PYTHON_INCLUDE_DIRS
}
${
PYTHON_INCLUDE_DIRS
}
${
NUMPY_INCLUDE_DIRS
}
${
NUMPY_INCLUDE_DIRS
}
$<INSTALL_INTERFACE:
${
CMAKE_INSTALL_INCLUDEDIR
}
>
)
$<BUILD_INTERFACE:
${
CMAKE_CURRENT_BINARY_DIR
}
/include>
$<INSTALL_INTERFACE:include>
)
IF
(
NOT WIN32
)
IF
(
NOT WIN32
)
TARGET_COMPILE_OPTIONS
(
${
PROJECT_NAME
}
PRIVATE $<$<CXX_COMPILER_ID:MSVC>:-bigobj>
"-Wno-conversion"
)
TARGET_COMPILE_OPTIONS
(
${
PROJECT_NAME
}
PRIVATE $<$<CXX_COMPILER_ID:MSVC>:-bigobj>
"-Wno-conversion"
)
...
@@ -180,7 +181,7 @@ TARGET_LINK_BOOST_PYTHON(${PROJECT_NAME} PUBLIC)
...
@@ -180,7 +181,7 @@ TARGET_LINK_BOOST_PYTHON(${PROJECT_NAME} PUBLIC)
PKG_CONFIG_USE_DEPENDENCY
(
${
PROJECT_NAME
}
eigen3
)
PKG_CONFIG_USE_DEPENDENCY
(
${
PROJECT_NAME
}
eigen3
)
INSTALL
(
TARGETS
${
PROJECT_NAME
}
INSTALL
(
TARGETS
${
PROJECT_NAME
}
EXPORT
${
TARGETS_EXPORT_NAME
}
EXPORT
${
TARGETS_EXPORT_NAME
}
PUBLIC_HEADER
PUBLIC_HEADER
DESTINATION
${
CMAKE_INSTALL_FULL_INCLUDEDIR
}
INCLUDES DESTINATION
${
CMAKE_INSTALL_FULL_INCLUDEDIR
}
INCLUDES DESTINATION
${
CMAKE_INSTALL_FULL_INCLUDEDIR
}
LIBRARY DESTINATION
${
CMAKE_INSTALL_FULL_LIBDIR
}
LIBRARY DESTINATION
${
CMAKE_INSTALL_FULL_LIBDIR
}
ARCHIVE DESTINATION
${
CMAKE_INSTALL_FULL_LIBDIR
}
ARCHIVE DESTINATION
${
CMAKE_INSTALL_FULL_LIBDIR
}
...
@@ -189,9 +190,6 @@ INSTALL(TARGETS ${PROJECT_NAME}
...
@@ -189,9 +190,6 @@ INSTALL(TARGETS ${PROJECT_NAME}
ADD_HEADER_GROUP
(
${
PROJECT_NAME
}
_HEADERS
)
ADD_HEADER_GROUP
(
${
PROJECT_NAME
}
_HEADERS
)
ADD_SOURCE_GROUP
(
${
PROJECT_NAME
}
_SOURCES
)
ADD_SOURCE_GROUP
(
${
PROJECT_NAME
}
_SOURCES
)
TARGET_INCLUDE_DIRECTORIES
(
${
PROJECT_NAME
}
INTERFACE
"$<BUILD_INTERFACE:
${
CMAKE_CURRENT_BINARY_DIR
}
>"
)
SET
(
PUBLIC_HEADER
${${
PROJECT_NAME
}
_HEADERS
}
)
# Install package for ROS
# Install package for ROS
install
(
FILES package.xml DESTINATION share/eigenpy
)
install
(
FILES package.xml DESTINATION share/eigenpy
)
...
...
This diff is collapsed.
Click to expand it.
cmake
@
1e577483
Compare
321eb1cc
...
1e577483
Subproject commit
321eb1ccf1d94570eb564f3659b13ef3ef82239e
Subproject commit
1e577483d7ed38a810c86f53972b9bc8b13d6e33
This diff is collapsed.
Click to expand it.
include/eigenpy/quaternion.hpp
+
1
−
1
View file @
2f73fce0
...
@@ -83,7 +83,7 @@ namespace eigenpy
...
@@ -83,7 +83,7 @@ namespace eigenpy
"
\t
quat: a quaternion."
))
"
\t
quat: a quaternion."
))
.
def
(
"__init__"
,
bp
::
make_constructor
(
&
QuaternionVisitor
::
FromTwoVectors
,
.
def
(
"__init__"
,
bp
::
make_constructor
(
&
QuaternionVisitor
::
FromTwoVectors
,
bp
::
default_call_policies
(),
bp
::
default_call_policies
(),
(
bp
::
arg
(
"u
: a 3D vector"
),
bp
::
arg
(
"v: a 3D vector
"
))),
(
bp
::
arg
(
"u
"
),
bp
::
arg
(
"v
"
))),
"Initialize from two vectors u and v"
)
"Initialize from two vectors u and v"
)
.
def
(
bp
::
init
<
Scalar
,
Scalar
,
Scalar
,
Scalar
>
.
def
(
bp
::
init
<
Scalar
,
Scalar
,
Scalar
,
Scalar
>
((
bp
::
arg
(
"self"
),
bp
::
arg
(
"w"
),
bp
::
arg
(
"x"
),
bp
::
arg
(
"y"
),
bp
::
arg
(
"z"
)),
((
bp
::
arg
(
"self"
),
bp
::
arg
(
"w"
),
bp
::
arg
(
"x"
),
bp
::
arg
(
"y"
),
bp
::
arg
(
"z"
)),
...
...
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