Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Guilhem Saurel
hpp-fcl
Commits
6531987e
Unverified
Commit
6531987e
authored
Feb 20, 2019
by
Guilhem Saurel
Committed by
GitHub
Feb 20, 2019
Browse files
Merge pull request #60 from nim65s/osx
Fix CI on OSX
parents
818c2de7
189965a3
Pipeline
#3176
passed with stage
in 47 minutes and 54 seconds
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
.travis.yml
View file @
6531987e
language
:
cpp
language
:
cpp
env
:
env
:
-
BUILD_TYPE=Debug
global
:
-
BUILD_TYPE=Release
-
CTEST_PARALLEL_LEVEL=4
matrix
:
-
BUILD_TYPE=Debug
-
BUILD_TYPE=Release
matrix
:
matrix
:
include
:
include
:
...
@@ -32,7 +35,7 @@ script:
...
@@ -32,7 +35,7 @@ script:
-
make -j4
-
make -j4
# Run unit tests
# 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
# Make sure we can install and uninstall with no issues
-
sudo make -j4 install
-
sudo make -j4 install
...
...
CMakeLists.txt
View file @
6531987e
...
@@ -170,4 +170,4 @@ IF(HPP_FCL_HAVE_OCTOMAP)
...
@@ -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
}
"
)
"-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
)
ENDIF
(
HPP_FCL_HAVE_OCTOMAP
)
setup_project_finalize
()
setup_
hpp_
project_finalize
()
ci/install_osx.sh
View file @
6531987e
...
@@ -6,3 +6,4 @@ brew install boost
...
@@ -6,3 +6,4 @@ brew install boost
brew
install
libccd
brew
install
libccd
brew
install
assimp
brew
install
assimp
brew
install
eigen
brew
install
eigen
brew
install
octomap
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment