Skip to content

Sync submodule CMake #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 23, 2020
Merged

Sync submodule CMake #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c746b9f
readme: update content
jcarpent Apr 23, 2020
ddb0494
package.xml: Support for Ubuntu 20.04 / Python 3
wxmerkt Apr 23, 2020
5a2aecb
Update to package format version 3
wxmerkt Apr 23, 2020
8b2a925
Merge pull request #187 from wxmerkt/wxm-prepare-for-focal
jcarpent Apr 23, 2020
0525e36
cmake: sync submodule
jcarpent Apr 23, 2020
d86ec49
ros: update version
jcarpent Apr 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ EigenPy — Efficient Python bindings between Numpy/Eigen

## Setup

The installation of **EigenPy** on your computer is made easy for Linux/BSD and Mac OS X environments.
The installation of **EigenPy** on your computer is made easy for Linux/BSD, Mac OS X and Windows environments.

### The Conda approach

Expand Down Expand Up @@ -69,10 +69,6 @@ and then install **EigenPy** for Python 3.x with:
```
brew install eigenpy
```
or for Python 2.7:
```
brew install eigenpy@2
```

## Credits

Expand Down
2 changes: 1 addition & 1 deletion cmake
Open in desktop
Submodule cmake updated 5 files
+56 −46 Config.cmake.in
+3 −3 boost.cmake
+7 −1 doxygen.cmake
+5 −2 hpp/doc.cmake
+12 −10 package-config.cmake
10 changes: 6 additions & 4 deletions package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<package format="3">
<name>eigenpy</name>
<version>2.3.1</version>
<version>2.3.2</version>
<description>Bindings between Numpy and Eigen using Boost.Python</description>
<maintainer email="justin.carpentier@inria.fr">Justin Carpentier</maintainer>
<maintainer email="wolfgang.merkt@ed.ac.uk">Wolfgang Merkt</maintainer>
Expand All @@ -13,8 +13,10 @@

<build_depend>git</build_depend>
<build_depend>doxygen</build_depend>
<depend>python</depend>
<depend>python-numpy</depend>
<depend condition="$ROS_PYTHON_VERSION == 2">python</depend>
<depend condition="$ROS_PYTHON_VERSION == 3">python3</depend>
<depend condition="$ROS_PYTHON_VERSION == 2">python-numpy</depend>
<depend condition="$ROS_PYTHON_VERSION == 3">python3-numpy</depend>
<depend>eigen</depend>
<depend>boost</depend>

Expand Down