Merge pull request #962 from jcarpent/devel

Update packaging

.gitlab-ci.yml

@@ -17,7 +17,8 @@ cache:
   script:
     - mkdir -p ccache
     - cd /root/robotpkg/math
-    - git pull
+    - git fetch
+    - git reset --hard origin/master
     - cd pinocchio
     - make checkout MASTER_REPOSITORY="git ${CI_PROJECT_DIR}/.git"
     - make install

CMakeLists.txt

@@ -20,16 +20,8 @@ IF(NOT EXISTS "${CMAKE_SOURCE_DIR}/cmake/base.cmake")
 ENDIF()
 
 INCLUDE(cmake/base.cmake)
-IF(CMAKE_VERSION VERSION_GREATER "3.0.0")
-  CMAKE_POLICY(SET CMP0048 NEW)
-  IF(CMAKE_VERSION VERSION_GREATER "3.9.0")
-    PROJECT(${PROJECT_NAME} VERSION ${PROJECT_VERSION_FULL} LANGUAGES CXX DESCRIPTION ${PROJECT_DESCRIPTION})
-  ELSE(CMAKE_VERSION VERSION_GREATER "3.9.0")
-    PROJECT(${PROJECT_NAME} VERSION ${PROJECT_VERSION_FULL} LANGUAGES CXX)
-  ENDIF(CMAKE_VERSION VERSION_GREATER "3.9.0")
-ELSE(CMAKE_VERSION VERSION_GREATER "3.0.0")
-  PROJECT(${PROJECT_NAME} CXX)
-ENDIF(CMAKE_VERSION VERSION_GREATER "3.0.0")
+COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
+PROJECT(${PROJECT_NAME} ${PROJECT_ARGS})
 
 INCLUDE(cmake/boost.cmake)
 INCLUDE(cmake/python.cmake)

benchmark/CMakeLists.txt

 #
-# Copyright (c) 2015-2018 CNRS
+# Copyright (c) 2015-2019 CNRS INRIA
 #
 
 # ----------------------------------------------------
@@ -57,7 +57,6 @@ ADD_BENCH(timings-cholesky TRUE)
 # timings derivatives
  
 ADD_BENCH(timings-derivatives TRUE)
-TARGET_LINK_LIBRARIES(timings-derivatives ${PROJECT_NAME})
 IF(CPPAD_FOUND)
   PKG_CONFIG_USE_DEPENDENCY(timings-derivatives "cppad")
 ENDIF(CPPAD_FOUND)
@@ -69,6 +68,7 @@ ENDIF(CPPADCG_FOUND)
 # timings-eigen
 # 
 ADD_BENCH(timings-eigen)
+PKG_CONFIG_USE_DEPENDENCY(timings-eigen "eigen3")
 
 # timings-geometry
 # 

cmake @ 17d8f9db

-Subproject commit df86256ef2b3e9420369d8749a719982ce6aeb14
+Subproject commit 17d8f9db4c512004a1d205ca93c2648d81b59e51