Unverified Commit 36604bee authored by Joseph Mirabel's avatar Joseph Mirabel Committed by GitHub
Browse files

Merge pull request #94 from gabrielebndn/topic/version

Add version support
parents dffbd8fb 1ba93d41
Subproject commit efa25a9976b8a6fc9f51d26924d4238d0d4820b1 Subproject commit 46dc4a57521bde14ea75c959b6b4f887af50c65d
...@@ -39,6 +39,7 @@ SET(LIBRARY_NAME hppfcl) ...@@ -39,6 +39,7 @@ SET(LIBRARY_NAME hppfcl)
INCLUDE_DIRECTORIES("${Boost_INCLUDE_DIRS}" ${PYTHON_INCLUDE_DIRS}) INCLUDE_DIRECTORIES("${Boost_INCLUDE_DIRS}" ${PYTHON_INCLUDE_DIRS})
ADD_LIBRARY(${LIBRARY_NAME} SHARED ADD_LIBRARY(${LIBRARY_NAME} SHARED
version.cc
math.cc math.cc
collision-geometries.cc collision-geometries.cc
collision.cc collision.cc
......
...@@ -62,6 +62,7 @@ void exposeMeshLoader () ...@@ -62,6 +62,7 @@ void exposeMeshLoader ()
BOOST_PYTHON_MODULE(hppfcl) BOOST_PYTHON_MODULE(hppfcl)
{ {
exposeVersion();
exposeMaths(); exposeMaths();
exposeCollisionGeometries(); exposeCollisionGeometries();
exposeMeshLoader(); exposeMeshLoader();
......
void exposeMaths (); void exposeVersion();
void exposeCollisionGeometries (); void exposeMaths();
void exposeMeshLoader (); void exposeCollisionGeometries();
void exposeCollisionAPI (); void exposeMeshLoader();
void exposeDistanceAPI (); void exposeCollisionAPI();
void exposeDistanceAPI();
//
// Copyright (c) 2019 CNRS
//
#include "hpp/fcl/config.hh"
#include <boost/python.hpp>
#include <boost/preprocessor/stringize.hpp>
namespace bp = boost::python;
inline bool checkVersionAtLeast(unsigned int major,
unsigned int minor,
unsigned int patch)
{
return HPP_FCL_VERSION_AT_LEAST(major, minor, patch);
}
inline bool checkVersionAtMost(unsigned int major,
unsigned int minor,
unsigned int patch)
{
return HPP_FCL_VERSION_AT_MOST(major, minor, patch);
}
void exposeVersion()
{
// Define release numbers of the current hpp-fcl version.
bp::scope().attr("__version__") = BOOST_PP_STRINGIZE(HPP_FCL_MAJOR_VERSION) "."
BOOST_PP_STRINGIZE(HPP_FCL_MINOR_VERSION) "."
BOOST_PP_STRINGIZE(HPP_FCL_PATCH_VERSION);
bp::scope().attr("HPP_FCL_MAJOR_VERSION") = HPP_FCL_MAJOR_VERSION;
bp::scope().attr("HPP_FCL_MINOR_VERSION") = HPP_FCL_MINOR_VERSION;
bp::scope().attr("HPP_FCL_PATCH_VERSION") = HPP_FCL_PATCH_VERSION;
bp::def("checkVersionAtLeast",&checkVersionAtLeast,
bp::args("major","minor","patch"),
"Checks if the current version of hpp-fcl is at least"
" the version provided by the input arguments.");
bp::def("checkVersionAtMost",&checkVersionAtMost,
bp::args("major","minor","patch"),
"Checks if the current version of hpp-fcl is at most"
" the version provided by the input arguments.");
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment