disable vcpkg bootstrap when not required

This commit is contained in:
Stefano Sinigardi
2019-04-18 18:23:12 +02:00
parent f0a158e0cd
commit b8962b22eb

View File

@ -892,7 +892,7 @@ install:
- if [ -d "$HOME/vcpkg/.git" ] ; then echo vcpkg cached ; else rm -rf vcpkg ; git clone https://github.com/Microsoft/vcpkg ; fi - if [ -d "$HOME/vcpkg/.git" ] ; then echo vcpkg cached ; else rm -rf vcpkg ; git clone https://github.com/Microsoft/vcpkg ; fi
- cd vcpkg - cd vcpkg
- git pull - git pull
- ./bootstrap-vcpkg.sh - if [[ USE_VCPKG = true ]] ; then ./bootstrap-vcpkg.sh ; fi
- if [[ USE_VCPKG = true ]] ; then travis_wait ./vcpkg install stb pthreads ; fi - if [[ USE_VCPKG = true ]] ; then travis_wait ./vcpkg install stb pthreads ; fi
- if [[ USE_VCPKG = true ]] && [[ ! -z "${CUDACXX}" ]] ; then travis_wait ./vcpkg install opencv[ffmpeg,cuda] ; fi - if [[ USE_VCPKG = true ]] && [[ ! -z "${CUDACXX}" ]] ; then travis_wait ./vcpkg install opencv[ffmpeg,cuda] ; fi
- if [[ USE_VCPKG = true ]] && [[ -z "${CUDACXX}" ]] ; then travis_wait ./vcpkg install opencv[ffmpeg] ; fi - if [[ USE_VCPKG = true ]] && [[ -z "${CUDACXX}" ]] ; then travis_wait ./vcpkg install opencv[ffmpeg] ; fi