Unverified Commit 5fd04405 authored by Joseph Mirabel's avatar Joseph Mirabel Committed by GitHub
Browse files

Merge pull request #100 from jmirabel/refactoring

Merge devel into refactoring
parents a2493c1e 8ed2e148
...@@ -6,11 +6,15 @@ env: ...@@ -6,11 +6,15 @@ env:
- CTEST_OUTPUT_ON_FAILURE=1 - CTEST_OUTPUT_ON_FAILURE=1
- CXX_FLAGS_DEBUG="-O1" - CXX_FLAGS_DEBUG="-O1"
- BUILD_PYTHON_INTERFACE=ON - BUILD_PYTHON_INTERFACE=ON
- MAKEFLAGS="-j2"
cache:
ccache: true
matrix: matrix:
include: include:
- name: "Trusty - Debug - g++" - name: "Trusty - Release - g++"
env: BUILD_TYPE=Debug env: BUILD_TYPE=Release
dist: trusty dist: trusty
compiler: g++ compiler: g++
addons: addons:
...@@ -21,18 +25,6 @@ matrix: ...@@ -21,18 +25,6 @@ matrix:
- libassimp-dev - libassimp-dev
- libeigen3-dev - libeigen3-dev
- name: "Xenial - Debug - g++"
env: BUILD_TYPE=Debug
dist: xenial
compiler: g++
addons:
apt:
packages:
- cmake
- libboost-all-dev
- libassimp-dev
- libeigen3-dev
- liboctomap-dev
- name: "Xenial - Release - g++" - name: "Xenial - Release - g++"
env: BUILD_TYPE=Release env: BUILD_TYPE=Release
dist: xenial dist: xenial
...@@ -45,10 +37,11 @@ matrix: ...@@ -45,10 +37,11 @@ matrix:
- libassimp-dev - libassimp-dev
- libeigen3-dev - libeigen3-dev
- liboctomap-dev - liboctomap-dev
- name: "Xenial - Debug - clang"
env: BUILD_TYPE=Debug - name: "Bionic - Release - g++"
dist: xenial env: BUILD_TYPE=Release
compiler: clang dist: bionic
compiler: g++
addons: addons:
apt: apt:
packages: packages:
...@@ -60,7 +53,7 @@ matrix: ...@@ -60,7 +53,7 @@ matrix:
- name: "Bionic - Debug - g++" - name: "Bionic - Debug - g++"
env: BUILD_TYPE=Debug env: BUILD_TYPE=Debug
dist: xenial dist: bionic
compiler: g++ compiler: g++
addons: addons:
apt: apt:
...@@ -71,27 +64,18 @@ matrix: ...@@ -71,27 +64,18 @@ matrix:
- libeigen3-dev - libeigen3-dev
- liboctomap-dev - liboctomap-dev
- name: "OSX - Debug - clang" - name: "OSX - Release - clang"
env: BUILD_TYPE=Debug env: BUILD_TYPE=Release
os: osx os: osx
compiler: clang compiler: clang
addons: cache:
homebrew: ccache: true
update: true directories:
packages: - $HOME/Library/Caches/Homebrew
- git # build
- doxygen # build
- cmake # build
- pkg-config # build
- boost
- brewsci/homebrew-science/cddlib
- assimp
- eigen
- octomap
before_install: before_install:
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then source travis_custom/custom_before_install_linux.sh ; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then source travis_custom/custom_before_install_linux.sh ; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then source travis_custom/custom_before_install_osx.sh ; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then source travis_custom/custom_before_install_osx.sh ; fi
script: script:
# Create build directory # Create build directory
...@@ -102,11 +86,11 @@ script: ...@@ -102,11 +86,11 @@ script:
- cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS=-w -DCMAKE_CXX_FLAGS_DEBUG=${CXX_FLAGS_DEBUG} -DBUILD_PYTHON_INTERFACE=${BUILD_PYTHON_INTERFACE} .. - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS=-w -DCMAKE_CXX_FLAGS_DEBUG=${CXX_FLAGS_DEBUG} -DBUILD_PYTHON_INTERFACE=${BUILD_PYTHON_INTERFACE} ..
# Build # Build
- make -j4 - make
# Run unit tests # Run unit tests
- travis_wait 30 ctest - travis_wait 30 make test
# Make sure we can install and uninstall with no issues # Make sure we can install and uninstall with no issues
- sudo make -j4 install - sudo make install
- sudo make -j4 uninstall - sudo make uninstall
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
* *
* Copyright (c) 2011-2014, Willow Garage, Inc. * Copyright (c) 2011-2014, Willow Garage, Inc.
* Copyright (c) 2014-2015, Open Source Robotics Foundation * Copyright (c) 2014-2015, Open Source Robotics Foundation
* Copyright (c) 2016, CNRS - LAAS * Copyright (c) 2016-2019, CNRS - LAAS
* Copyright (c) 2019, INRIA
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
...@@ -34,6 +34,14 @@ ...@@ -34,6 +34,14 @@
#include <hpp/fcl/mesh_loader/assimp.h> #include <hpp/fcl/mesh_loader/assimp.h>
// Assimp >= 5.0 is forcing the use of C++11 keywords. A fix has been submitted https://github.com/assimp/assimp/pull/2758.
// The next lines fixes the bug for current version of hpp-fcl.
#include <assimp/defs.h>
#if __cplusplus < 201103L && defined(AI_NO_EXCEPT)
#undef AI_NO_EXCEPT
#define AI_NO_EXCEPT
#endif
#ifdef HPP_FCL_USE_ASSIMP_UNIFIED_HEADER_NAMES #ifdef HPP_FCL_USE_ASSIMP_UNIFIED_HEADER_NAMES
#include <assimp/DefaultLogger.hpp> #include <assimp/DefaultLogger.hpp>
#include <assimp/IOStream.hpp> #include <assimp/IOStream.hpp>
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
brew tap gepetto/homebrew-gepetto brew tap gepetto/homebrew-gepetto
# install eigenpy # install eigenpy
brew install eigenpy brew install boost assimp eigen octomap eigenpy
# set environment variables # set environment variables
export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/opt/openrobots/lib/pkgconfig" export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/opt/openrobots/lib/pkgconfig"
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/openrobots/lib" export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/openrobots/lib"
\ No newline at end of file
Supports Markdown
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