diff --git a/CHANGELOG.md b/CHANGELOG.md index c219e3af..dee89141 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ * Add flat_streambuf * Rename to BEAST_DOXYGEN * Update .gitignore for VS2017 +* Fix README.md CMake instructions API Changes: diff --git a/README.md b/README.md index a7afea68..e62d19e9 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,13 @@ Beast -[![Join the chat at https://gitter.im/vinniefalco/Beast](https://badges.gitter.im/vinniefalco/Beast.svg)](https://gitter.im/vinniefalco/Beast?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://travis-ci.org/vinniefalco/Beast.svg?branch=master)](https://travis-ci.org/vinniefalco/Beast) [![Build status](https://ci.appveyor.com/api/projects/status/g0llpbvhpjuxjnlw?svg=true)](https://ci.appveyor.com/project/vinniefalco/beast) [![codecov](https://codecov.io/gh/vinniefalco/Beast/branch/master/graph/badge.svg)](https://codecov.io/gh/vinniefalco/Beast) [![coveralls](https://coveralls.io/repos/github/vinniefalco/Beast/badge.svg?branch=master)](https://coveralls.io/github/vinniefalco/Beast?branch=master) [![Documentation](https://img.shields.io/badge/documentation-master-brightgreen.svg)](http://vinniefalco.github.io/beast/) [![License](https://img.shields.io/badge/license-boost-brightgreen.svg)](LICENSE_1_0.txt) +[![Join the chat at https://gitter.im/vinniefalco/Beast](https://badges.gitter.im/vinniefalco/Beast.svg)](https://gitter.im/vinniefalco/Beast?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[![Build Status](https://travis-ci.org/vinniefalco/Beast.svg?branch=master)](https://travis-ci.org/vinniefalco/Beast) +[![Build status](https://ci.appveyor.com/api/projects/status/g0llpbvhpjuxjnlw?svg=true)](https://ci.appveyor.com/project/vinniefalco/beast) +[![codecov](https://codecov.io/gh/vinniefalco/Beast/branch/master/graph/badge.svg)](https://codecov.io/gh/vinniefalco/Beast) +[![coveralls](https://coveralls.io/repos/github/vinniefalco/Beast/badge.svg?branch=master)](https://coveralls.io/github/vinniefalco/Beast?branch=master) +[![Documentation](https://img.shields.io/badge/documentation-master-brightgreen.svg)](http://vinniefalco.github.io/beast/) +[![License](https://img.shields.io/badge/license-boost-brightgreen.svg)](LICENSE_1_0.txt) # HTTP and WebSocket built on Boost.Asio in C++11 @@ -106,24 +112,18 @@ instructions on how to do this for your particular build system. For the examples and tests, Beast provides build scripts for Boost.Build (bjam) and CMake. It is possible to generate Microsoft Visual Studio or Apple -Developers using Microsoft Visual Studio can generate Visual Studio -project files by executing these commands from the root of the repository: +Xcode project files using CMake by executing these commands from +the root of the repository: ``` cd bin cmake .. # for 32-bit Windows builds +cmake -G Xcode .. # for Apple Xcode builds cd ../bin64 -cmake .. # for Linux/Mac builds, OR -cmake -G"Visual Studio 14 2015 Win64" .. # for 64-bit Windows builds -``` +cmake -G"Visual Studio 14 2015 Win64" .. # for 64-bit Windows builds (VS2015) +cmake -G"Visual Studio 15 2017 Win64" .. # for 64-bit Windows builds (VS2017) -When using Apple Xcode it is possible to generate Xcode project files -using these commands: - -``` -cd bin -cmake -G Xcode .. # for Apple Xcode builds ``` To build with Boost.Build, it is necessary to have the bjam executable