Merge remote-tracking branch 'origin/master'

This commit is contained in:
Fred Nicolson 2017-05-31 09:35:00 +01:00
commit 0a00f0ca61
3 changed files with 7 additions and 4 deletions

View File

@ -1,5 +1,7 @@
dist: trusty
sudo: required
cache:
apt: true
language:
- cpp
compiler:
@ -14,8 +16,8 @@ addons:
- cmake
script:
# Link gcc-6 and g++-6 to their standard commands
- ln -s /usr/bin/gcc-6 /usr/local/bin/gcc
- ln -s /usr/bin/g++-6 /usr/local/bin/g++
- sudo ln -s /usr/bin/gcc-6 /usr/local/bin/gcc
- sudo ln -s /usr/bin/g++-6 /usr/local/bin/g++
# Export CC and CXX to tell cmake which compiler to use
- export CC=/usr/bin/gcc-6
- export CXX=/usr/bin/g++-6

View File

@ -1,4 +1,5 @@
# frnetlib
![Build Status](https://travis-ci.org/Cloaked9000/frnetlib.svg?branch=master)
Frnetlib, is a small and fast networking library written in C++. It can be used for both messaging and for sending/receiving HTTP requests. There are no library dependencies (unless you want to use SSL, in which case MbedTLS is required), and it should compile fine with any C++11 compliant compiler. The API should be considered relatively stable, but things could change as new features are added, given that the library is still in the early stages of development.

View File

@ -24,7 +24,7 @@ else()
endif()
#Link tests
target_link_libraries(${FRNETLIB_TEST} gtest_main frnetlib)
target_link_libraries(${FRNETLIB_TEST} frnetlib)
add_test(test1 ${FRNETLIB_TEST})
#Run tests automatically