diff --git a/.travis.yml b/.travis.yml index 2a9810ae..dd00c8f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,14 +40,16 @@ matrix: packages: - g++-4.7 env: COMPILER=4.7 + - os: osx install: - python -c 'import sys; print(sys.version_info[:])' -- if [ "$CXX" = "g++" ]; then export CXX="g++-$COMPILER" CC="gcc-$COMPILER"; fi +- if [ "$CXX" = "g++" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then export CXX="g++-$COMPILER" CC="gcc-$COMPILER"; fi - if [ "$CXX" = "clang++" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then export CXX="clang++-$COMPILER" CC="clang-$COMPILER"; fi +- if ["$TRAVIS_OS_NAME" = "osx" ] ; then export CXX="clang++" CC="clang"; fi - DEPS_DIR="${TRAVIS_BUILD_DIR}/deps" -- cd $TRAVIS_BUILD_DIR && . .ci/build_cmake.sh -- cd $TRAVIS_BUILD_DIR && . .ci/build_doxygen.sh +- if [ "$TRAVIS_OS_NAME" = "linux" ] ; then cd $TRAVIS_BUILD_DIR && . .ci/build_cmake.sh ; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ] ; then cd $TRAVIS_BUILD_DIR && . .ci/build_doxygen.sh ; fi - cd "${DEPS_DIR}" - if [ "$(python -c 'import sys; print(sys.version_info[0])')" = "2" ] ; then pip install --user pathlib; fi diff --git a/README.md b/README.md index 98fb0e36..d08ab562 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,8 @@ An acceptable CLI parser library should be all of the following: * Easy to include (i.e., header only, one file if possible, no external requirements): While many programs depend on Boost, that should not be a requirement if all you want is CLI parsing. * Short Syntax: This is one of the main points of a CLI parser, it should make variables from the command line nearly as easy to define as any other variables. If most of your program is hidden in CLI parsing, this is a problem for readability. * C++11 or better: Should work with GCC 4.7+ (such as GCC 4.8 on CentOS 7) or above, or Clang 3.5+, or MSVC 2015+. (Note: for CLI11, Clang 3.4 only fails because of tests, googlemock does not support it.) -* Work on Linux, MacOS, and Windows. -* Well tested using Travis (Linux and Mac) and [Appveyor](https://ci.appveyor.com/project/HenrySchreiner/cli11) (Windows). +* Work on Linux, macOS, and Windows. +* Well tested using Travis (Linux and macOS) and [Appveyor](https://ci.appveyor.com/project/HenrySchreiner/cli11) (Windows). * Clear help printing. * Standard shell idioms supported naturally, like grouping flags, a positional separator, etc. * Easy to execute, with help, parse errors, etc. providing correct exit and details.