Skip to content

Commit

Permalink
Merge pull request #34 from mloskot/master
Browse files Browse the repository at this point in the history
README update and minimal CMake version update
  • Loading branch information
mloskot committed Jan 25, 2013
2 parents 0812f75 + afd37b4 commit 840125e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
11 changes: 6 additions & 5 deletions README
@@ -1,13 +1,14 @@
= SOCI - The C++ Database Access Library =

NOTICE: Git and bug tracker soon to be moved to https://github.com/SOCI

Project website: http://soci.sourceforge.net

Development, Download, Bug Tracking, Mailing Lists:
GitHub hosts SOCI source code repository,
issues tracker and wiki: https://github.com/SOCI

Project website at http://soci.sourceforge.net
Release downloads and mailing lists at
http://sourceforge.net/projects/soci/

Travis CI service at https://travis-ci.org/SOCI/soci

== Requirements ==

Core:
Expand Down
2 changes: 1 addition & 1 deletion doc/installation.html
Expand Up @@ -53,7 +53,7 @@ <h3 id="downloading">Downloading</h3>

<h3 id="cmake">Building using CMake</h3>

<p>SOCI is configured to build using <a href="http://cmake.org/">CMake</a> system in version 2.6+.</p>
<p>SOCI is configured to build using <a href="http://cmake.org/">CMake</a> system in version 2.8+.</p>

<p>The build configuration allows to control various aspects of compilation and installation by setting common CMake variables that change behaviour, describe system or control build (see <a href="http://cmake.org/cmake/help/documentation.html">CMake help</a>) as well as SOCI-specific variables described below. All these variables are available regardless of platform or compilation toolset used.</p>

Expand Down

0 comments on commit 840125e

Please sign in to comment.