Merge pull request #1366 from jcarpent/topic/release

Fixes issues with ROS and set minimal CMake version to 3.0
stack-of-tasks · Jan 6, 2021 · 9389400 · 9389400
2 parents 178f146 + 548859a
commit 9389400
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@
 # Copyright (c) 2015 Wandercraft, 86 rue de Paris 91400 Orsay, France.
 #
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
 
 SET(PROJECT_NAME pinocchio)
 SET(PROJECT_DESCRIPTION "A fast and flexible implementation of Rigid Body Dynamics algorithms and their analytical derivatives")
@@ -261,28 +261,37 @@ ADD_SUBDIRECTORY(examples)
 ADD_SUBDIRECTORY(benchmark)
 
 # --- PACKAGING ----------------------------------------------------------------
+MACRO(EXPORT_VARIABLE var_name var_value)
+  GET_DIRECTORY_PROPERTY(has_parent PARENT_DIRECTORY)
+  IF(has_parent)
+    SET(${var_name} ${var_value} PARENT_SCOPE)
+  ELSE()
+    SET(${var_name} ${var_value})
+  ENDIF()
+ENDMACRO(EXPORT_VARIABLE var_name var_value)
+
 IF(BUILD_WITH_URDF_SUPPORT)
-  SET(PINOCCHIO_USE_URDFDOM ON PARENT_SCOPE)
+  EXPORT_VARIABLE(PINOCCHIO_USE_URDFDOM ON)
   SET(PACKAGE_EXTRA_MACROS "${PACKAGE_EXTRA_MACROS}\nset(PINOCCHIO_USE_URDFDOM \"\")")
 ENDIF()
 IF(BUILD_WITH_HPP_FCL_SUPPORT)
-  SET(PINOCCHIO_USE_HPP_FCL ON)
+  EXPORT_VARIABLE(PINOCCHIO_USE_HPP_FCL ON)
   SET(PACKAGE_EXTRA_MACROS "${PACKAGE_EXTRA_MACROS}\nset(PINOCCHIO_USE_HPP_FCL \"\")")
 ENDIF()
 IF(BUILD_WITH_CPPAD_SUPPORT)
-  SET(PINOCCHIO_USE_CPPAD ON)
+  EXPORT_VARIABLE(PINOCCHIO_USE_CPPAD ON)
   SET(PACKAGE_EXTRA_MACROS "${PACKAGE_EXTRA_MACROS}\nset(PINOCCHIO_USE_CPPAD \"\")")
 ENDIF()
 IF(BUILD_WITH_CPPAD_CODEGEN_SUPPORT)
-  SET(PINOCCHIO_USE_CPPAD_CODEGEN ON)
+  EXPORT_VARIABLE(PINOCCHIO_USE_CPPAD_CODEGEN ON)
   SET(PACKAGE_EXTRA_MACROS "${PACKAGE_EXTRA_MACROS}\nset(PINOCCHIO_USE_CPPAD_CODEGEN \"\")")
 ENDIF()
 IF(BUILD_WITH_CASADI_SUPPORT)
-  SET(PINOCCHIO_USE_CASADI ON)
+  EXPORT_VARIABLE(PINOCCHIO_USE_CASADI ON)
   SET(PACKAGE_EXTRA_MACROS "${PACKAGE_EXTRA_MACROS}\nset(PINOCCHIO_USE_CASADI \"\")")
 ENDIF()
 IF(BUILD_PYTHON_INTERFACE)
-  SET(PINOCCHIO_WITH_PYTHON_INTERFACE ON)
+  EXPORT_VARIABLE(PINOCCHIO_WITH_PYTHON_INTERFACE ON)
   SET(PACKAGE_EXTRA_MACROS "${PACKAGE_EXTRA_MACROS}\nset(PINOCCHIO_WITH_PYTHON_INTERFACE \"\")")
 ENDIF()
 

diff --git a/README.md b/README.md
@@ -118,7 +118,7 @@ To cite **Pinocchio** in your academic research, please use the following bibtex
    author = {Justin Carpentier and Florian Valenza and Nicolas Mansard and others},
    title = {Pinocchio: fast forward and inverse dynamics for poly-articulated systems},
    howpublished = {https://stack-of-tasks.github.io/pinocchio},
-   year = {2015--2020}
+   year = {2015--2021}
 }
 ```
 and the following one for the reference to the paper introducing **Pinocchio**:

diff --git a/package.xml b/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>pinocchio</name>
-  <version>2.5.4</version>
+  <version>2.5.5</version>
   <description>A fast and flexible implementation of Rigid Body Dynamics algorithms and their analytical derivatives.</description>
   <!-- The maintainer listed here is for the ROS release to receive emails for the buildfarm. 
   Please check the repository URL for full list of authors and maintainers. -->

diff --git a/src/utils/file-explorer.cpp b/src/utils/file-explorer.cpp
@@ -1,7 +1,8 @@
 //
-// Copyright (c) 2016-2020 CNRS INRIA
+// Copyright (c) 2016-2021 CNRS INRIA
 //
 
+#include <cstdlib>
 #include "pinocchio/utils/file-explorer.hpp"
 
 namespace pinocchio