Skip to content
Snippets Groups Projects
Commit c2fa1abc authored by Justin Carpentier's avatar Justin Carpentier
Browse files

[wip/eigenpy] Bump to version 1.3.2

parent 2947dac1
No related branches found
No related tags found
No related merge requests found
......@@ -2,11 +2,10 @@
# Created: Olivier Stasse, Feb 3rd 2016
#
VERSION= 1.3.1
PKGREVISION = 1
VERSION= 1.3.2
DISTNAME= eigenpy-${VERSION}
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=eigenpy/}
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=${PKGBASE}/}
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}/stack-of-tasks/eigenpy
MAINTAINER= hpp@laas.fr
......
@comment Fri Oct 14 15:16:28 CEST 2016
@comment Thu Dec 1 11:54:36 CET 2016
include/eigenpy/angle-axis.hpp
include/eigenpy/config.hh
include/eigenpy/deprecated.hh
......@@ -10,6 +10,7 @@ include/eigenpy/geometry.hpp
include/eigenpy/map.hpp
include/eigenpy/memory.hpp
include/eigenpy/quaternion.hpp
include/eigenpy/registration.hpp
include/eigenpy/warning.hh
lib/libeigenpy.so
lib/pkgconfig/eigenpy.pc
SHA1 (eigenpy-1.3.1.tar.gz) = 6746165f32a6bfdcad0562514b4d23349240856a
RMD160 (eigenpy-1.3.1.tar.gz) = 19615b855d8695474caf8171588da23a85c02991
Size (eigenpy-1.3.1.tar.gz) = 832420 bytes
SHA1 (patch-aa) = 93d01d7e34890418623684a38b4f413818e62cf3
SHA1 (patch-ab) = ff3e5b94cceea47656dfee58fbef1d6feead5132
SHA1 (eigenpy-1.3.2.tar.gz) = ece30f93505dd03ba717e6b5bcb2116d5c40f7c6
RMD160 (eigenpy-1.3.2.tar.gz) = b5c64d23a11d5814a7e1a877ac66cc993f9cbec3
Size (eigenpy-1.3.2.tar.gz) = 833849 bytes
diff --git CMakeLists.txt CMakeLists.txt
index f37d345..82e8857 100644
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -23,6 +23,7 @@ INCLUDE(cmake/python.cmake)
SET(PROJECT_NAME eigenpy)
SET(PROJECT_DESCRIPTION "Wrapping Eigen3 -- numpy")
SET(PROJECT_URL "http://github.com/stack-of-tasks/eigenpy")
+OPTION(INSTALL_DOCUMENTATION "Generate and install the documentation" FALSE)
# Disable -Werror on Unix for now.
SET(CXX_DISABLE_WERROR True)
@@ -72,7 +73,7 @@ INCLUDE_DIRECTORIES(${NUMPY_INCLUDE_DIRS})
# ----------------------------------------------------
# --- INCLUDE ----------------------------------------
# ----------------------------------------------------
-SET(${PROJECT_NAME}_HEADERS
+SET(HEADERS
src/eigenpy.hpp
src/exception.hpp
src/details.hpp
@@ -86,7 +87,7 @@ SET(${PROJECT_NAME}_HEADERS
MAKE_DIRECTORY("${${PROJECT_NAME}_BINARY_DIR}/include/eigenpy")
INCLUDE_DIRECTORIES(${${PROJECT_NAME}_BINARY_DIR}/include/eigenpy)
-FOREACH(header ${${PROJECT_NAME}_HEADERS})
+FOREACH(header ${HEADERS})
GET_FILENAME_COMPONENT(headerName ${header} NAME)
IF(WIN32)
execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
diff --git src/details.hpp src/details.hpp
index 2c724f8..9ab072b 100644
--- src/details.hpp
+++ src/details.hpp
@@ -146,26 +146,34 @@ namespace eigenpy
if (!PyArray_Check(obj_ptr))
{
+#ifndef NDEBUG
std::cerr << "The python object is not a numpy array." << std::endl;
+#endif
return 0;
}
if (PyArray_NDIM(obj_ptr) != 2)
if ( (PyArray_NDIM(obj_ptr) !=1) || (! MatType::IsVectorAtCompileTime) )
{
+#ifndef NDEBUG
std::cerr << "The number of dimension of the object is not correct." << std::endl;
+#endif
return 0;
}
if ((PyArray_ObjectType(obj_ptr, 0)) != NumpyEquivalentType<T>::type_code)
{
+#ifndef NDEBUG
std::cerr << "The internal type as no Eigen equivalent." << std::endl;
+#endif
return 0;
}
if (!(PyArray_FLAGS(obj_ptr) & NPY_ALIGNED))
{
+#ifndef NDEBUG
std::cerr << "NPY non-aligned matrices are not implemented." << std::endl;
+#endif
return 0;
}
diff -bu cmake~/base.cmake cmake/base.cmake
--- cmake~/base.cmake 2016-07-27 07:05:07.000000000 +0200
+++ cmake/base.cmake 2016-10-14 15:13:58.549230035 +0200
@@ -155,6 +155,13 @@
SET(CMAKE_VERBOSE_MAKEFILE TRUE)
ENDIF(${ARGC})
+ # If the variable INSTALL_DOCUMENTATION is not set, then the project will install the doc. Otherwise,
+ # the doc will be installed if INSTALL_DOCUMENTATION is set to TRUE.
+ IF(DEFINED INSTALL_DOCUMENTATION)
+ SET(_INSTALL_DOC ${INSTALL_DOCUMENTATION} CACHE INTERNAL "")
+ ELSE(DEFINED INSTALL_DOCUMENTATION)
+ SET(_INSTALL_DOC TRUE CACHE INTERNAL "")
+ ENDIF(DEFINED INSTALL_DOCUMENTATION)
ENABLE_TESTING()
Common subdirectories: cmake~/doxygen and cmake/doxygen
diff -bu cmake~/doxygen.cmake cmake/doxygen.cmake
--- cmake~/doxygen.cmake 2016-07-27 07:05:07.000000000 +0200
+++ cmake/doxygen.cmake 2016-10-14 15:13:58.553230088 +0200
@@ -23,6 +23,7 @@
# DOXYGEN_DOT_IMAGE_FORMAT: format for dot images. Defaults to "svg".
# DOXYGEN_USE_MATHJAX: use MathJax to render LaTeX equations. Defaults to "NO".
MACRO(_SETUP_PROJECT_DOCUMENTATION)
+
# Search for Doxygen.
FIND_PACKAGE(Doxygen)
@@ -68,7 +69,9 @@
COMMENT "Generating Doxygen documentation"
)
+ IF(_INSTALL_DOC)
INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_MAKE_PROGRAM} doc)")
+ ENDIF(_INSTALL_DOC)
ENDIF(MSVC)
IF (DOXYGEN_USE_TEMPLATE_CSS)
@@ -117,6 +120,7 @@
ENDIF()
# Install generated files.
+ IF(_INSTALL_DOC)
INSTALL(
FILES ${CMAKE_CURRENT_BINARY_DIR}/doc/${PROJECT_NAME}.doxytag
DESTINATION ${CMAKE_INSTALL_DOCDIR}/doxygen-html)
@@ -127,6 +131,7 @@
INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/doc/pictures
DESTINATION ${CMAKE_INSTALL_DOCDIR}/doxygen-html)
ENDIF(EXISTS ${PROJECT_SOURCE_DIR}/doc/pictures)
+ ENDIF(_INSTALL_DOC)
LIST(APPEND LOGGING_WATCHED_VARIABLES
DOXYGEN_SKIP_DOT
Common subdirectories: cmake~/dynamic_graph and cmake/dynamic_graph
Only in cmake: .git
Common subdirectories: cmake~/github and cmake/github
Common subdirectories: cmake~/image and cmake/image
diff -bu cmake~/pkg-config.cmake cmake/pkg-config.cmake
--- cmake~/pkg-config.cmake 2016-07-27 07:05:07.000000000 +0200
+++ cmake/pkg-config.cmake 2016-10-14 15:13:58.569230295 +0200
@@ -36,8 +36,14 @@
SET(_PKG_CONFIG_INCLUDEDIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}" CACHE INTERNAL "")
SET(_PKG_CONFIG_DATAROOTDIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}" CACHE INTERNAL "")
SET(_PKG_CONFIG_PKGDATAROOTDIR "${CMAKE_INSTALL_FULL_DATADIR}" CACHE INTERNAL "")
+ IF(_INSTALL_DOC)
SET(_PKG_CONFIG_DOCDIR "${CMAKE_INSTALL_FULL_DOCDIR}" CACHE INTERNAL "")
SET(_PKG_CONFIG_DOXYGENDOCDIR "${_PKG_CONFIG_DOCDIR}/doxygen-html" CACHE INTERNAL "")
+ ELSE(_INSTALL_DOC)
+ SET(_PKG_CONFIG_DOCDIR "" CACHE INTERNAL "")
+ SET(_PKG_CONFIG_DOXYGENDOCDIR "" CACHE INTERNAL "")
+ ENDIF(_INSTALL_DOC)
+
IF(DEFINED PROJECT_DEBUG_POSTFIX)
IF(DEFINED CMAKE_CONFIGURATION_TYPES)
SET(_PKG_CONFIG_PROJECT_NAME_NOPOSTFIX "${PROJECT_NAME}" CACHE INTERNAL "")
Common subdirectories: cmake~/python and cmake/python
Common subdirectories: cmake~/sphinx and cmake/sphinx
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment