Skip to content

Commit

Permalink
Configure OS X build on Travis-CI
Browse files Browse the repository at this point in the history
  • Loading branch information
rakhimov committed Aug 15, 2016
1 parent f61c098 commit 418fa08
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 4 deletions.
18 changes: 15 additions & 3 deletions .travis.yml
Expand Up @@ -7,6 +7,10 @@ compiler:
- gcc
- clang

os:
- linux
- osx

env:
global:
# Skip user-input
Expand All @@ -18,6 +22,11 @@ env:
# For weidai11/cryptopp#232
- CXXFLAGS="-maes -march=native"

matrix:
exclude:
- os: osx
compiler: gcc

addons:
apt:
packages:
Expand All @@ -33,11 +42,14 @@ addons:

before_install:
- git submodule update --init --recursive
- sudo add-apt-repository -y ppa:kojoley/boost
- sudo apt-get -q update
- if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then sudo add-apt-repository -y ppa:kojoley/boost; sudo apt-get -q update; fi
- if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then brew update; fi

install:
- sudo apt-get -y install libboost-{chrono,log,program-options,date-time,thread,system,filesystem,regex,test}1.58{-dev,.0}
- if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then sudo apt-get -y install libboost-{chrono,log,program-options,date-time,thread,system,filesystem,regex,test}1.58{-dev,.0}; fi

- if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then brew upgrade boost; fi
- if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then brew install cryptopp openssl miniupnpc doxygen; fi

before_script:
- if [ "$CC" = "gcc" ]; then export CC=gcc-${GCC_VERSION}; fi
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -59,7 +59,7 @@ cmake-debug = -D CMAKE_BUILD_TYPE=Debug
#cmake-release = -D CMAKE_BUILD_TYPE=Release

# Our base cmake command
cmake = cmake $(cmake-gen) $(cmake-debug) -D CMAKE_C_COMPILER=$(CC) -D CMAKE_CXX_COMPILER=$(CXX)
cmake = cmake $(cmake-gen) $(cmake-debug)

# Dependencies options
cmake-cpp-netlib = -D CPP-NETLIB_BUILD_TESTS=OFF -D CPP-NETLIB_BUILD_EXAMPLES=OFF
Expand Down

0 comments on commit 418fa08

Please sign in to comment.