Skip to content

Commit 9389400

Browse files
authored
Merge pull request #1366 from jcarpent/topic/release
Fixes issues with ROS and set minimal CMake version to 3.0
2 parents 178f146 + 548859a commit 9389400

File tree

4 files changed

+20
-10
lines changed

4 files changed

+20
-10
lines changed

CMakeLists.txt

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright (c) 2015 Wandercraft, 86 rue de Paris 91400 Orsay, France.
44
#
55

6-
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
6+
CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
77

88
SET(PROJECT_NAME pinocchio)
99
SET(PROJECT_DESCRIPTION "A fast and flexible implementation of Rigid Body Dynamics algorithms and their analytical derivatives")
@@ -261,28 +261,37 @@ ADD_SUBDIRECTORY(examples)
261261
ADD_SUBDIRECTORY(benchmark)
262262

263263
# --- PACKAGING ----------------------------------------------------------------
264+
MACRO(EXPORT_VARIABLE var_name var_value)
265+
GET_DIRECTORY_PROPERTY(has_parent PARENT_DIRECTORY)
266+
IF(has_parent)
267+
SET(${var_name} ${var_value} PARENT_SCOPE)
268+
ELSE()
269+
SET(${var_name} ${var_value})
270+
ENDIF()
271+
ENDMACRO(EXPORT_VARIABLE var_name var_value)
272+
264273
IF(BUILD_WITH_URDF_SUPPORT)
265-
SET(PINOCCHIO_USE_URDFDOM ON PARENT_SCOPE)
274+
EXPORT_VARIABLE(PINOCCHIO_USE_URDFDOM ON)
266275
SET(PACKAGE_EXTRA_MACROS "${PACKAGE_EXTRA_MACROS}\nset(PINOCCHIO_USE_URDFDOM \"\")")
267276
ENDIF()
268277
IF(BUILD_WITH_HPP_FCL_SUPPORT)
269-
SET(PINOCCHIO_USE_HPP_FCL ON)
278+
EXPORT_VARIABLE(PINOCCHIO_USE_HPP_FCL ON)
270279
SET(PACKAGE_EXTRA_MACROS "${PACKAGE_EXTRA_MACROS}\nset(PINOCCHIO_USE_HPP_FCL \"\")")
271280
ENDIF()
272281
IF(BUILD_WITH_CPPAD_SUPPORT)
273-
SET(PINOCCHIO_USE_CPPAD ON)
282+
EXPORT_VARIABLE(PINOCCHIO_USE_CPPAD ON)
274283
SET(PACKAGE_EXTRA_MACROS "${PACKAGE_EXTRA_MACROS}\nset(PINOCCHIO_USE_CPPAD \"\")")
275284
ENDIF()
276285
IF(BUILD_WITH_CPPAD_CODEGEN_SUPPORT)
277-
SET(PINOCCHIO_USE_CPPAD_CODEGEN ON)
286+
EXPORT_VARIABLE(PINOCCHIO_USE_CPPAD_CODEGEN ON)
278287
SET(PACKAGE_EXTRA_MACROS "${PACKAGE_EXTRA_MACROS}\nset(PINOCCHIO_USE_CPPAD_CODEGEN \"\")")
279288
ENDIF()
280289
IF(BUILD_WITH_CASADI_SUPPORT)
281-
SET(PINOCCHIO_USE_CASADI ON)
290+
EXPORT_VARIABLE(PINOCCHIO_USE_CASADI ON)
282291
SET(PACKAGE_EXTRA_MACROS "${PACKAGE_EXTRA_MACROS}\nset(PINOCCHIO_USE_CASADI \"\")")
283292
ENDIF()
284293
IF(BUILD_PYTHON_INTERFACE)
285-
SET(PINOCCHIO_WITH_PYTHON_INTERFACE ON)
294+
EXPORT_VARIABLE(PINOCCHIO_WITH_PYTHON_INTERFACE ON)
286295
SET(PACKAGE_EXTRA_MACROS "${PACKAGE_EXTRA_MACROS}\nset(PINOCCHIO_WITH_PYTHON_INTERFACE \"\")")
287296
ENDIF()
288297

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ To cite **Pinocchio** in your academic research, please use the following bibtex
118118
author = {Justin Carpentier and Florian Valenza and Nicolas Mansard and others},
119119
title = {Pinocchio: fast forward and inverse dynamics for poly-articulated systems},
120120
howpublished = {https://stack-of-tasks.github.io/pinocchio},
121-
year = {2015--2020}
121+
year = {2015--2021}
122122
}
123123
```
124124
and the following one for the reference to the paper introducing **Pinocchio**:

package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="3">
33
<name>pinocchio</name>
4-
<version>2.5.4</version>
4+
<version>2.5.5</version>
55
<description>A fast and flexible implementation of Rigid Body Dynamics algorithms and their analytical derivatives.</description>
66
<!-- The maintainer listed here is for the ROS release to receive emails for the buildfarm.
77
Please check the repository URL for full list of authors and maintainers. -->

src/utils/file-explorer.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
//
2-
// Copyright (c) 2016-2020 CNRS INRIA
2+
// Copyright (c) 2016-2021 CNRS INRIA
33
//
44

5+
#include <cstdlib>
56
#include "pinocchio/utils/file-explorer.hpp"
67

78
namespace pinocchio

0 commit comments

Comments
 (0)