Merge pull request #189 from jcarpent/master

Sync submodule CMake
stack-of-tasks · Apr 23, 2020 · 34126cf · 34126cf
2 parents f53d54d + d86ec49
commit 34126cf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -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
 
@@ -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
 

diff --git a/cmake b/cmake
diff --git a/package.xml b/package.xml
@@ -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="[email protected]">Justin Carpentier</maintainer>
   <maintainer email="[email protected]">Wolfgang Merkt</maintainer>
@@ -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>
+56 −46		Config.cmake.in
+3 −3		boost.cmake
+7 −1		doxygen.cmake
+5 −2		hpp/doc.cmake
+12 −10		package-config.cmake