Merge pull request #30 from nim65s/devel

Maintenance

.gitlab-ci.yml

+include: http://rainboard.laas.fr/project/hpp-rbprm/.gitlab-ci.yml

CMakeLists.txt

@@ -24,15 +24,15 @@ INCLUDE(cmake/boost.cmake)
 INCLUDE(cmake/hpp.cmake)
 INCLUDE(cmake/test.cmake)
 
-SET(PROJECT_ORG humanoid-path-planner)
 SET(PROJECT_NAME hpp-rbprm)
 SET(PROJECT_DESCRIPTION
   "Implementation of RB-PRM planner using hpp."
   )
-SET(PROJECT_URL "https://github.com/${PROJECT_ORG}/${PROJECT_NAME}")
 
+SETUP_HPP_PROJECT()
 
-SETUP_PROJECT()
+SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/find-external/CDD")
+FIND_PACKAGE(CDD REQUIRED)
 
 ADD_REQUIRED_DEPENDENCY("hpp-core >= 4.2")
 ADD_REQUIRED_DEPENDENCY("hpp-util >= 3")

README.md

 #  Humanoid Path Planner - RBPRM module
 
+[![Pipeline status](https://gepgitlab.laas.fr/humanoid-path-planner/hpp-rbprm/badges/master/pipeline.svg)](https://gepgitlab.laas.fr/humanoid-path-planner/hpp-rbprm/commits/master)
+[![Coverage report](https://gepgitlab.laas.fr/humanoid-path-planner/hpp-rbprm/badges/master/coverage.svg?job=doc-coverage)](http://projects.laas.fr/gepetto/doc/humanoid-path-planner/hpp-rbprm/master/coverage/)
+
 Copyright 2015 LAAS-CNRS
 
 Author: Steve Tonneau

cmake @ a4e20624

-Subproject commit c8da73d0b0aa607e335b49bb456d4d5edf90f180
+Subproject commit a4e206247098888ee3eb89917b27ae6b382d9cf8

cmake2/FindCDD.cmake

-# - Try to find libcdd
-# Once done this will define
-#  CDD_FOUND - System has CDD
-#  CDD_INCLUDE_DIRS - The CDD include directories
-#  CDD_LIBRARIES - The libraries needed to use CDD
-#  CDD_DEFINITIONS - Compiler switches required for using CDD
-
-
-find_path(CDD_INCLUDE_DIR cdd/cdd.h
-          HINTS ${CDD_INCLUDEDIR} /usr/include
-          PATH_SUFFIXES CDD )
-
-find_library(CDD_LIBRARY NAMES libcdd.so
-             HINTS ${CDD_LIBDIR} ${CDD_LIBRARY_DIRS} /usr/lib/libcdd.so )
-
-set(CDD_LIBRARIES ${CDD_LIBRARY} )
-set(CDD_INCLUDE_DIRS ${CDD_INCLUDE_DIR} )
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set CDD_FOUND to TRUE
-# if all listed variables are TRUE
-find_package_handle_standard_args(CDD  DEFAULT_MSG
-                                  CDD_LIBRARY CDD_INCLUDE_DIR)
-
-mark_as_advanced(CDD_INCLUDE_DIR CDD_LIBRARY )

src/CMakeLists.txt

@@ -76,6 +76,7 @@ ADD_LIBRARY(${LIBRARY_NAME}
   )
 
 TARGET_LINK_LIBRARIES(${LIBRARY_NAME} hpp-centroidal-dynamics hpp-bezier-com-traj)
+TARGET_INCLUDE_DIRECTORIES(${LIBRARY_NAME} PUBLIC ${CDD_INCLUDE_DIRS})
 
 PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} hpp-core)
 PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} hpp-util)