Merge pull request #45 from nim65s/devel

[CI] use generated configuration directly

.gitlab-ci.yml

-variables:
-  GIT_SUBMODULE_STRATEGY: "recursive"
-  GIT_DEPTH: "3"
-  CCACHE_BASEDIR: "${CI_PROJECT_DIR}"
-  CCACHE_DIR: "${CI_PROJECT_DIR}/ccache"
-
-cache:
-  paths:
-    - ccache
-
-.robotpkg-hpp-fcl: &robotpkg-hpp-fcl
-  except:
-    - gh-pages
-  script:
-    - mkdir -p ccache
-    - cd /root/robotpkg/path/hpp-fcl
-    - git pull
-    - make checkout MASTER_REPOSITORY="dir ${CI_PROJECT_DIR}"
-    - make install
-    - cd work.$(hostname)/$(make show-var VARNAME=DISTNAME)
-    - make test
-
-robotpkg-hpp-fcl-14.04-release:
-  <<: *robotpkg-hpp-fcl
-  image: eur0c.laas.fr:5000/humanoid-path-planner/hpp-fcl/hpp-fcl:14.04
-
-robotpkg-hpp-fcl-16.04-release:
-  <<: *robotpkg-hpp-fcl
-  image: eur0c.laas.fr:5000/humanoid-path-planner/hpp-fcl/hpp-fcl:16.04
-
-robotpkg-hpp-fcl-18.04-release:
-  <<: *robotpkg-hpp-fcl
-  image: eur0c.laas.fr:5000/humanoid-path-planner/hpp-fcl/hpp-fcl:18.04
-
-doc-coverage:
-  <<: *robotpkg-hpp-fcl
-  image: eur0c.laas.fr:5000/humanoid-path-planner/hpp-fcl/hpp-fcl:16.04
-  before_script:
-    - echo -e 'CXXFLAGS+= --coverage\nLDFLAGS+= --coverage\nPKG_DEFAULT_OPTIONS= debug' >> /opt/openrobots/etc/robotpkg.conf
-  after_script:
-    - cd /root/robotpkg/path/hpp-fcl
-    - cd work.$(hostname)/$(make show-var VARNAME=DISTNAME)
-    - make doc
-    - mv doc/doxygen-html ${CI_PROJECT_DIR}
-    - mkdir -p ${CI_PROJECT_DIR}/coverage/
-    - gcovr -r .
-    - gcovr -r . --html --html-details -o ${CI_PROJECT_DIR}/coverage/index.html
-  artifacts:
-    expire_in: 1 day
-    paths:
-      - doxygen-html/
-      - coverage/
-
+include: http://rainboard.laas.fr/project/hpp-fcl/.gitlab-ci.yml

.travis.yml

 language: cpp
 
-os:
-  - linux
-  - osx
-
-compiler:
-  - gcc
-  - clang
-
 env:
   - BUILD_TYPE=Debug
   - BUILD_TYPE=Release
 
 matrix:
-  exclude:
-    - os: osx
+  include:
+    - dist: trusty
       compiler: gcc
+    - dist: xenial
+      compiler: gcc
+    - dist: trusty
+      compiler: clang
+    - dist: xenial
+      compiler: clang
+    - os: osx
+      compiler: clang
 
 install:
   # Install dependencies for FCL
@@ -25,7 +25,7 @@ install:
 script:
   # Create build directory
   - mkdir build
-  - cd build 
+  - cd build
 
   # Configure
   - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS=-w ..
@@ -39,4 +39,3 @@ script:
   # Make sure we can install and uninstall with no issues
   - sudo make -j4 install
   - sudo make -j4 uninstall
-

ci/install_osx.sh

@@ -5,3 +5,4 @@ brew install cmake
 brew install boost
 brew install libccd
 brew install assimp
+brew install eigen

test/CMakeLists.txt

@@ -49,5 +49,5 @@ PKG_CONFIG_USE_DEPENDENCY(test_fcl_profiling assimp)
 add_fcl_test(test_fcl_gjk test_fcl_gjk.cpp)
 
 ## Benchmark
-add_executable(benchmark benchmark.cpp test_fcl_utility.cpp)
-target_link_libraries(benchmark hpp-fcl ${Boost_LIBRARIES})
+add_executable(test-benchmark benchmark.cpp test_fcl_utility.cpp)
+target_link_libraries(test-benchmark hpp-fcl ${Boost_LIBRARIES})