Commit 91a8698c90380c025550c63fcae43c2228e7e4c3
1 parent
14f1c9b8
Fixing Travis builds
Showing
2 changed files
with
3 additions
and
3 deletions
.travis.yml
| @@ -52,7 +52,7 @@ matrix: | @@ -52,7 +52,7 @@ matrix: | ||
| 52 | - COMPILER=4.7 | 52 | - COMPILER=4.7 |
| 53 | - os: osx | 53 | - os: osx |
| 54 | before_install: | 54 | before_install: |
| 55 | - - python -m ensurepip | 55 | + - python -m ensurepip --default-pip |
| 56 | install: | 56 | install: |
| 57 | - python -c 'import sys; print(sys.version_info[:])' | 57 | - python -c 'import sys; print(sys.version_info[:])' |
| 58 | - DEPS_DIR="${TRAVIS_BUILD_DIR}/deps" | 58 | - DEPS_DIR="${TRAVIS_BUILD_DIR}/deps" |
| @@ -61,7 +61,7 @@ install: | @@ -61,7 +61,7 @@ install: | ||
| 61 | - if [ "$TRAVIS_OS_NAME" = "linux" ] ; then cd $TRAVIS_BUILD_DIR && . .ci/build_doxygen.sh ; fi | 61 | - if [ "$TRAVIS_OS_NAME" = "linux" ] ; then cd $TRAVIS_BUILD_DIR && . .ci/build_doxygen.sh ; fi |
| 62 | - if [ -n "$COVERALLS" ] ; then cd $TRAVIS_BUILD_DIR && . .ci/build_lcov.sh ; fi | 62 | - if [ -n "$COVERALLS" ] ; then cd $TRAVIS_BUILD_DIR && . .ci/build_lcov.sh ; fi |
| 63 | - cd "${DEPS_DIR}" | 63 | - cd "${DEPS_DIR}" |
| 64 | -- if [ "$(python -c 'import sys; print(sys.version_info[0])')" = "2" ] ; then pip install --user pathlib ; fi | 64 | +- if [ "$(python -c 'import sys; print(sys.version_info[0])')" = "2" ] ; then python -m pip install --user pathlib ; fi |
| 65 | - cmake --version | 65 | - cmake --version |
| 66 | script: | 66 | script: |
| 67 | - cd "${TRAVIS_BUILD_DIR}" | 67 | - cd "${TRAVIS_BUILD_DIR}" |
include/CLI/App.hpp
| @@ -361,7 +361,7 @@ class App { | @@ -361,7 +361,7 @@ class App { | ||
| 361 | help_ptr_ = add_flag(name, description); | 361 | help_ptr_ = add_flag(name, description); |
| 362 | help_ptr_->configurable(false); | 362 | help_ptr_->configurable(false); |
| 363 | } | 363 | } |
| 364 | - | 364 | + |
| 365 | return help_ptr_; | 365 | return help_ptr_; |
| 366 | } | 366 | } |
| 367 | 367 |