Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
jpbarrette committed Feb 18, 2017
2 parents f590378 + 28cd1d9 commit 26782dc
Show file tree
Hide file tree
Showing 149 changed files with 437 additions and 13,445 deletions.
29 changes: 6 additions & 23 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,11 @@
*.dylib
*.lai
Makefile
Makefile.in
*~

build/
m4/
aclocal.m4
aclocal.m4.bak
autom4te.cache/
compile
configure
config.guess
config.log
config.status
config.sub
curlpp-config
curlpp.pc
curlpp.spec
depcomp
include/curlpp/config.h
include/curlpp/config.h.in
include/curlpp/stamp-h1
install-sh
libtool
ltmain.sh
missing
CMakeFiles/

examples/example01
examples/example02
Expand Down Expand Up @@ -57,5 +39,6 @@ examples/example23
examples/example24
examples/example25


*.exe
*.exe
CMakeCache.txt

54 changes: 54 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
language: cpp

# precise gcc doesn't have c++11 support

matrix:
include:
- os: linux
dist: trusty
compiler: clang
env: NAME="trusty"
- os: linux
dist: trusty
compiler: gcc
env: NAME="trusty"
- os: linux
dist: precise
compiler: clang
env: NAME="precise"
- os: osx
osx_image: xcode7.2
- os: osx
compiler: clang
- os: osx
compiler: gcc

addons:
apt:
packages:
- libcurl4-openssl-dev

before_script:
- mkdir build && cd build
- cmake ../

script:
- make && sudo make install
- cd ../examples && mkdir build && cd build
- cmake ../
- make


install:
- echo install-----------------------------------------------------------------
# Download and install libcurl
- if [[ $TRAVIS_OS_NAME == "osx" ]]; then
brew update;
brew install curl;
fi
# install cmake 3.2 for precise
- if [[ $NAME == "precise" ]]; then
sudo add-apt-repository ppa:george-edison55/precise-backports --yes;
sudo apt-get update;
sudo apt-get install cmake-data cmake;
fi
186 changes: 0 additions & 186 deletions CHANGES

This file was deleted.

Loading

0 comments on commit 26782dc

Please sign in to comment.