Commit 6e81faff authored by Olivier Stasse's avatar Olivier Stasse
Browse files

[math/py-eigenpy] Update to 1.4.2

parent 1b989f95
......@@ -2,8 +2,7 @@
# Created: Olivier Stasse, Feb 3rd 2016
#
PKGREVISION= 2
VERSION= 1.4.1
VERSION= 1.4.2
PKGNAME= ${PKGTAG.python-}eigenpy-${VERSION}
DISTNAME= eigenpy-${VERSION}
......@@ -18,7 +17,7 @@ COMMENT= Eigen bindings to python
LICENSE= gnu-lgpl-v3
# this does not support multiple parallel python version
CONFLICTS+= py[0-9][0-9]-eigenpy-[0-9]*
#CONFLICTS+= py[0-9][0-9]-eigenpy-[0-9]*
# old package name
CONFLICTS+= eigenpy-[0-9]*
......
SHA1 (eigenpy-1.4.1.tar.gz) = 103a337e1e86d3ba88baba4eb0f2c0319c7a9bb8
RMD160 (eigenpy-1.4.1.tar.gz) = 74687ba5a8826f4bbae9eb418a57332cec577a40
Size (eigenpy-1.4.1.tar.gz) = 857873 bytes
SHA1 (patch-ac) = 31a1221954d1b9fc7b0fa708a232c19db0308041
SHA1 (patch-ad) = c81898745bd2927e9d6d5c8b598c5f638cd71d1d
SHA1 (eigenpy-1.4.2.tar.gz) = 10ae3f0ca43b846bcdf2d43ccab4b5362af44a65
RMD160 (eigenpy-1.4.2.tar.gz) = 87c0640fb36b2e4d8a9eff94aa9a98e6ca49986c
Size (eigenpy-1.4.2.tar.gz) = 860556 bytes
* Don't force python2.7
* Don't install two copies of the same headers. Prefer the namespaced path
version.
--- CMakeLists.txt~ 2018-01-17 09:34:55.000000000 +0100
+++ CMakeLists.txt 2018-02-27 14:52:07.032912038 +0100
@@ -67,7 +67,7 @@
# Add Boost path to include directories.
INCLUDE_DIRECTORIES(SYSTEM ${Boost_INCLUDE_DIRS})
-FINDPYTHON(2.7 EXACT REQUIRED)
+FINDPYTHON(REQUIRED)
INCLUDE_DIRECTORIES(SYSTEM ${PYTHON_INCLUDE_DIRS})
FIND_NUMPY()
INCLUDE_DIRECTORIES(SYSTEM ${NUMPY_INCLUDE_DIRS})
@@ -76,48 +76,37 @@
# --- INCLUDE ----------------------------------------
# ----------------------------------------------------
SET(${PROJECT_NAME}_SOLVERS_HEADERS
- solvers/solvers.hpp
- solvers/preconditioners.hpp
- solvers/IterativeSolverBase.hpp
- solvers/LeastSquaresConjugateGradient.hpp
- solvers/ConjugateGradient.hpp
- solvers/SparseSolverBase.hpp
- solvers/BasicPreconditioners.hpp
- solvers/BFGSPreconditioners.hpp
+ eigenpy/solvers/solvers.hpp
+ eigenpy/solvers/preconditioners.hpp
+ eigenpy/solvers/IterativeSolverBase.hpp
+ eigenpy/solvers/LeastSquaresConjugateGradient.hpp
+ eigenpy/solvers/ConjugateGradient.hpp
+ eigenpy/solvers/SparseSolverBase.hpp
+ eigenpy/solvers/BasicPreconditioners.hpp
+ eigenpy/solvers/BFGSPreconditioners.hpp
)
-SET(HEADERS
+SET(${PROJECT_NAME}_HEADERS
${${PROJECT_NAME}_SOLVERS_HEADERS}
- eigenpy.hpp
- exception.hpp
- details.hpp
- fwd.hpp
- map.hpp
- geometry.hpp
- memory.hpp
- registration.hpp
- angle-axis.hpp
- quaternion.hpp
- stride.hpp
- ref.hpp
+ eigenpy/eigenpy.hpp
+ eigenpy/exception.hpp
+ eigenpy/details.hpp
+ eigenpy/fwd.hpp
+ eigenpy/map.hpp
+ eigenpy/geometry.hpp
+ eigenpy/memory.hpp
+ eigenpy/registration.hpp
+ eigenpy/angle-axis.hpp
+ eigenpy/quaternion.hpp
+ eigenpy/stride.hpp
+ eigenpy/ref.hpp
)
-MAKE_DIRECTORY("${${PROJECT_NAME}_BINARY_DIR}/include/eigenpy")
-MAKE_DIRECTORY("${${PROJECT_NAME}_BINARY_DIR}/include/eigenpy/solvers")
-INCLUDE_DIRECTORIES(${${PROJECT_NAME}_BINARY_DIR}/include/eigenpy)
-
-SET(${PROJECT_NAME}_HEADERS)
-FOREACH(header ${HEADERS})
- GET_FILENAME_COMPONENT(headerName ${header} NAME)
- GET_FILENAME_COMPONENT(headerPath ${header} PATH)
- EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E ${LINK}
- ${${PROJECT_NAME}_SOURCE_DIR}/src/${header}
- ${${PROJECT_NAME}_BINARY_DIR}/include/${PROJECT_NAME}/${header})
- INSTALL(FILES ${${PROJECT_NAME}_SOURCE_DIR}/src/${header}
- DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME}/${headerPath}
- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE)
- LIST(APPEND ${PROJECT_NAME}_HEADERS src/${header})
-ENDFOREACH(header)
+EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E ${LINK}
+ ${${PROJECT_NAME}_SOURCE_DIR}/src
+ ${${PROJECT_NAME}_BINARY_DIR}/eigenpy)
+INCLUDE_DIRECTORIES(${${PROJECT_NAME}_BINARY_DIR}/include)
+INCLUDE_DIRECTORIES(${${PROJECT_NAME}_BINARY_DIR})
# ----------------------------------------------------
# --- TARGETS ----------------------------------------
Don't hardcode python library
--- cmake/boost.cmake~ 2017-10-26 15:25:19.000000000 +0200
+++ cmake/boost.cmake 2018-03-20 17:25:04.068790408 +0100
@@ -149,8 +149,9 @@
PKG_CONFIG_APPEND_LIBS_RAW(${Boost_${UPPERCOMPONENT}_LIBRARY})
ENDIF("${LOWERCOMPONENT}" MATCHES "python")
ELSE(APPLE)
- STRING(TOLOWER ${COMPONENT} LOWERCOMPONENT)
- PKG_CONFIG_APPEND_LIBS(boost_${LOWERCOMPONENT})
+ get_filename_component(l ${Boost_${UPPERCOMPONENT}_LIBRARY} NAME_WE)
+ string(REGEX REPLACE "^lib" "" l "${l}")
+ PKG_CONFIG_APPEND_LIBS_RAW("-l${l}")
ENDIF(APPLE)
ENDFOREACH()
ENDMACRO(PKG_CONFIG_APPEND_BOOST_LIBS)
Markdown is supported
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