Merge pull request #89 from jmirabel/refactoring

[travis] update CI.

.travis.yml

@@ -12,34 +12,80 @@ matrix:
       env: BUILD_TYPE=Debug
       dist: trusty
       compiler: g++
+      addons:
+        apt:
+          packages:
+            - cmake
+            - libboost-all-dev
+            - libassimp-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++"
       env: BUILD_TYPE=Release
       dist: xenial
       compiler: g++
+      addons:
+        apt:
+          packages:
+            - cmake
+            - libboost-all-dev
+            - libassimp-dev
+            - libeigen3-dev
+            - liboctomap-dev
     - name: "Xenial - Debug - clang"
       env: BUILD_TYPE=Debug
       dist: xenial
       compiler: clang
+      addons:
+        apt:
+          packages:
+            - cmake
+            - libboost-all-dev
+            - libassimp-dev
+            - libeigen3-dev
+            - liboctomap-dev
 
     - name: "Bionic - Debug - g++"
       env: BUILD_TYPE=Debug
       dist: xenial
       compiler: g++
+      addons:
+        apt:
+          packages:
+            - cmake
+            - libboost-all-dev
+            - libassimp-dev
+            - libeigen3-dev
+            - liboctomap-dev
 
     - name: "OSX - Debug - clang"
       env: BUILD_TYPE=Debug
       os: osx
       compiler: clang
-
-install:
-  # Install dependencies for FCL
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then 'ci/install_linux.sh' ; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx"   ]; then 'ci/install_osx.sh'   ; fi
+      addons:
+        homebrew:
+          taps: homebrew/science
+          update: true
+          packages:
+            - git
+            - cmake
+            - boost
+            - libccd
+            - assimp
+            - eigen
+            - octomap
 
 script:
   # Create build directory

CMakeLists.txt

@@ -83,7 +83,7 @@ endif ()
 search_for_boost()
 # Optional dependencies
 add_optional_dependency("octomap >= 1.6")
-if (OCTOMAP_INCLUDE_DIRS AND OCTOMAP_LIBRARY_DIRS)
+if (OCTOMAP_FOUND)
   include_directories(SYSTEM ${OCTOMAP_INCLUDE_DIRS})
   link_directories(${OCTOMAP_LIBRARY_DIRS})
   SET(HPP_FCL_HAVE_OCTOMAP TRUE)

ci/install_linux.sh

-sudo apt-get -qq update
-
-########################
-# Mendatory dependencies
-########################
-sudo apt-get -qq --yes --force-yes install cmake
-sudo apt-get -qq --yes --force-yes install libboost-all-dev
-sudo apt-get -qq --yes --force-yes install libassimp-dev
-sudo apt-get -qq --yes --force-yes install libeigen3-dev
-
-# Octomap
-git clone https://github.com/OctoMap/octomap
-cd octomap
-git checkout tags/v1.8.0
-mkdir build
-cd build
-cmake ..
-make
-sudo make install
-

ci/install_osx.sh

-brew tap homebrew/science
-
-brew install git
-brew install cmake
-brew install boost
-brew install libccd
-brew install assimp
-brew install eigen
-brew install octomap

test/collision.cpp

@@ -44,6 +44,7 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/utility/binary.hpp>
 
+#include <fstream>
 #include <boost/filesystem.hpp>
 #include <boost/assign/list_of.hpp>