Skip to content

Commit bd7beda

Browse files
committed
cmake: change python lib name (to avoid conflicts)
1 parent 38869d7 commit bd7beda

File tree

3 files changed

+14
-15
lines changed

3 files changed

+14
-15
lines changed

python/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ SET_TARGET_PROPERTIES(${PYWRAP}
3131
PROPERTIES
3232
PREFIX ""
3333
SUFFIX ${PYTHON_EXT_SUFFIX}
34-
OUTPUT_NAME "${PROJECT_NAME}"
3534
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/python/${PROJECT_NAME}"
3635
)
3736

python/eigenpy/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
2-
# Copyright (c) 2017-2019 CNRS INRIA
2+
# Copyright (c) 2017-2021 CNRS INRIA
33
#
44

5-
from .eigenpy import *
6-
from .eigenpy import __version__, __raw_version__
5+
from .eigenpy_pywrap import *
6+
from .eigenpy_pywrap import __version__, __raw_version__

python/main.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Copyright 2014-2019, CNRS
3-
* Copyright 2018-2020, INRIA
3+
* Copyright 2018-2021, INRIA
44
*/
55

66
#include "eigenpy/eigenpy.hpp"
@@ -19,42 +19,42 @@
1919

2020
using namespace eigenpy;
2121

22-
BOOST_PYTHON_MODULE(eigenpy)
22+
BOOST_PYTHON_MODULE(eigenpy_pywrap)
2323
{
2424
namespace bp = boost::python;
2525
enableEigenPy();
26-
26+
2727
bp::scope().attr("__version__") = eigenpy::printVersion();
2828
bp::scope().attr("__raw_version__") = bp::str(EIGENPY_VERSION);
2929
bp::def("checkVersionAtLeast",&eigenpy::checkVersionAtLeast,
3030
bp::args("major_version","minor_version","patch_version"),
3131
"Checks if the current version of EigenPy is at least the version provided by the input arguments.");
32-
32+
3333
exposeAngleAxis();
3434
exposeQuaternion();
3535
exposeGeometryConversion();
36-
36+
3737
exposeComputationInfo();
38-
38+
3939
{
4040
bp::scope solvers = boost::python::class_<SolversScope>("solvers");
4141
exposeSolvers();
4242
exposePreconditioners();
43-
43+
4444
register_symbolic_link_to_registered_type<Eigen::ComputationInfo>();
4545
}
46-
46+
4747
{
4848
using namespace Eigen;
49-
49+
5050
bp::def("is_approx",(bool (*)(const Eigen::MatrixBase<MatrixXd> &, const Eigen::MatrixBase<MatrixXd> &, const double &))&is_approx<MatrixXd,MatrixXd>,
5151
bp::args("A","B","prec"),
5252
"Returns True if A is approximately equal to B, within the precision determined by prec.");
53-
53+
5454
bp::def("is_approx",(bool (*)(const Eigen::MatrixBase<MatrixXd> &, const Eigen::MatrixBase<MatrixXd> &))&is_approx<MatrixXd,MatrixXd>,
5555
bp::args("A","B"),
5656
"Returns True if A is approximately equal to B.");
5757
}
58-
58+
5959
exposeDecompositions();
6060
}

0 commit comments

Comments
 (0)