Commit f64a2215 authored by Anthony Mallet's avatar Anthony Mallet
Browse files

[optimization/roboptim-core] Fix build with g++>7 and PLIST for old cmake

patch-aa: drop and attribute((unused)) that g++ does not accept in a
BOOST_STATIC_ASSERT construct.

patch-ab: fix PLIST for older cmake by not installing versionned symlinks for a
module.

Bump PKGREVISION
parent 1e5dbee8
......@@ -2,6 +2,7 @@
# Created: florent@laas.fr on Tue, 28 Apr 2009
#
PKGREVISION= 1
VERSION= 3.1
PACKAGE= roboptim-core
DISTNAME= ${PACKAGE}-${VERSION}
......@@ -28,6 +29,7 @@ DEPEND_ABI.g++ += g++>=4.6
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
include ../../devel/log4cxx/depend.mk
include ../../math/eigen3/depend.mk
include ../../pkgtools/pkg-config/depend.mk
include ../../mk/sysdep/cmake.mk
......
SHA1 (roboptim-core-3.1.tar.gz) = 5833c4cfd71ea5858bce6c1a49800613d37ef342
RMD160 (roboptim-core-3.1.tar.gz) = 7e15b0b4c5d62144eca87ab5c808004e48b3777c
Size (roboptim-core-3.1.tar.gz) = 394921 bytes
SHA1 (patch-aa) = 092cce50597092ecba45ae6bf023fdc80968efdb
SHA1 (patch-ab) = 5849301f47f4c78e88528451463718f67917174c
g++-7 does not accept the "attribute unused" here.
--- tests/detail-structured-input.cc~ 2015-06-26 17:08:46.000000000 +0200
+++ tests/detail-structured-input.cc 2018-04-06 17:19:28.037828198 +0200
@@ -144,9 +144,9 @@
// Note: here we use ROBOPTIM_UNUSED to prevent compiler warnings
// For more information, cf. https://svn.boost.org/trac/boost/ticket/7242
// F is a DifferentiableFunction, and as such exposes the getJacobianBlock() method
- BOOST_STATIC_ASSERT((boost::is_base_of<roboptim::detail::StructuredInputJacobianInternal<typename F<T>::parent_t, typename F<T>::traits_t>, F<T> >::value)) ROBOPTIM_UNUSED;
+ BOOST_STATIC_ASSERT((boost::is_base_of<roboptim::detail::StructuredInputJacobianInternal<typename F<T>::parent_t, typename F<T>::traits_t>, F<T> >::value));
// G is just a Function, and as such does not expose the getJacobianBlock() method
- BOOST_STATIC_ASSERT((!boost::is_base_of<roboptim::detail::StructuredInputJacobianInternal<typename G<T>::parent_t, typename G<T>::traits_t>, G<T> >::value)) ROBOPTIM_UNUSED;
+ BOOST_STATIC_ASSERT((!boost::is_base_of<roboptim::detail::StructuredInputJacobianInternal<typename G<T>::parent_t, typename G<T>::traits_t>, G<T> >::value));
typename F<T>::argument_t arg(22);
for(int i = 0; i < arg.size(); ++i)
Don't set SOVERSION for MODULE, cmake does not create symlinks for those
anyway, but older cmake would do it, leading to inconsistencies.
https://gitlab.kitware.com/cmake/cmake/commit/f799ffb5cb895855ac2aba54765622b81db5be38
--- src/CMakeLists.txt~ 2018-04-06 17:43:48.744158061 +0200
+++ src/CMakeLists.txt 2018-04-06 17:48:36.445557517 +0200
@@ -65,10 +65,6 @@
TARGET_LINK_LIBRARIES(roboptim-core-plugin-dummy roboptim-core)
SET_TARGET_PROPERTIES(roboptim-core-plugin-dummy PROPERTIES PREFIX "")
-IF(NOT APPLE)
- SET_TARGET_PROPERTIES(roboptim-core-plugin-dummy
- PROPERTIES VERSION 3.1.0 SOVERSION 3)
-ENDIF()
INSTALL(TARGETS roboptim-core-plugin-dummy DESTINATION ${PLUGINDIR})
# Dummy-laststate plug-in.
@@ -79,10 +74,6 @@
TARGET_LINK_LIBRARIES(roboptim-core-plugin-dummy-laststate roboptim-core)
SET_TARGET_PROPERTIES(roboptim-core-plugin-dummy-laststate PROPERTIES PREFIX "")
-IF(NOT APPLE)
- SET_TARGET_PROPERTIES(roboptim-core-plugin-dummy-laststate
- PROPERTIES VERSION 3.1.0 SOVERSION 3)
-ENDIF()
INSTALL(TARGETS roboptim-core-plugin-dummy-laststate DESTINATION ${PLUGINDIR})
# Dummy-laststate plug-in for differentiable sparse functions.
@@ -92,10 +83,6 @@
TARGET_LINK_LIBRARIES(roboptim-core-plugin-dummy-d-sparse-laststate roboptim-core)
SET_TARGET_PROPERTIES(roboptim-core-plugin-dummy-d-sparse-laststate PROPERTIES PREFIX "")
-IF(NOT APPLE)
- SET_TARGET_PROPERTIES(roboptim-core-plugin-dummy-d-sparse-laststate
- PROPERTIES VERSION 3.1.0 SOVERSION 3)
-ENDIF()
INSTALL(TARGETS roboptim-core-plugin-dummy-d-sparse-laststate DESTINATION ${PLUGINDIR})
# Dummy-td plug-in.
@@ -105,10 +92,6 @@
TARGET_LINK_LIBRARIES(roboptim-core-plugin-dummy-td roboptim-core)
SET_TARGET_PROPERTIES(roboptim-core-plugin-dummy-td PROPERTIES PREFIX "")
-IF(NOT APPLE)
- SET_TARGET_PROPERTIES(roboptim-core-plugin-dummy-td
- PROPERTIES VERSION 3.1.0 SOVERSION 3)
-ENDIF()
INSTALL(TARGETS roboptim-core-plugin-dummy-td DESTINATION ${PLUGINDIR})
IF(MSVC)
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