Merge pull request #60 from nim65s/osx

Fix CI on OSX

.travis.yml

@@ -1,8 +1,11 @@
 language: cpp
 
 env:
-  - BUILD_TYPE=Debug
-  - BUILD_TYPE=Release
+  global:
+    - CTEST_PARALLEL_LEVEL=4
+  matrix:
+    - BUILD_TYPE=Debug
+    - BUILD_TYPE=Release
 
 matrix:
   include:
@@ -32,7 +35,7 @@ script:
   - make -j4
 
   # Run unit tests
-  - make test
+  - travis_wait 30 make test || travis_wait 30 ctest -VV
 
   # Make sure we can install and uninstall with no issues
   - sudo make -j4 install

CMakeLists.txt

@@ -170,4 +170,4 @@ IF(HPP_FCL_HAVE_OCTOMAP)
     "-DHPP_FCL_HAVE_OCTOMAP -DFCL_HAVE_OCTOMAP -DOCTOMAP_MAJOR_VERSION=${OCTOMAP_MAJOR_VERSION} -DOCTOMAP_MINOR_VERSION=${OCTOMAP_MINOR_VERSION} -DOCTOMAP_PATCH_VERSION=${OCTOMAP_PATCH_VERSION}")
 ENDIF(HPP_FCL_HAVE_OCTOMAP)
 
-setup_project_finalize()
+setup_hpp_project_finalize()

ci/install_osx.sh

@@ -6,3 +6,4 @@ brew install boost
 brew install libccd
 brew install assimp
 brew install eigen
+brew install octomap