[shark] 02/79: updated installation page for windows

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository shark.

commit 39ed32ed9d8a4ea174519f592b798aa530874078
Author: Oswin <oswin.krause at di.ku.dk>
Date:   Mon Oct 26 09:48:30 2015 +0100

    updated installation page for windows
---
 .../rest_sources/getting_started/installation.rst  | 44 ++++++++++++++++++++--
 1 file changed, 41 insertions(+), 3 deletions(-)

diff --git a/doc/sphinx_pages/rest_sources/getting_started/installation.rst b/doc/sphinx_pages/rest_sources/getting_started/installation.rst
index 609180d..cf611f6 100644
--- a/doc/sphinx_pages/rest_sources/getting_started/installation.rst
+++ b/doc/sphinx_pages/rest_sources/getting_started/installation.rst
@@ -22,7 +22,7 @@ We are supporting packages for the following platforms:
 Installation
 ---------------------------------------------
 
-To install Shark, get the sources from our * :doc:`Downloads page <downloads>`
+To install Shark, get the sources from our :doc:`Downloads page <../downloads/downloads>`
 	
 Then build the library::
 
@@ -35,7 +35,7 @@ Dependencies
 ---------------------------------------------
 
 Shark relies on `Boost <http://www.boost.org>`_ and uses `CMake
-<http://www.cmake.org/>`_.
+<http://www.cmake.org/>`__.
 Furthermore, Shark can make use of different linear algebra libraries.
 On MacOsX, Accelerate is used by default. On Linux and Windows, ATLAS
 is used if available.
@@ -88,4 +88,42 @@ Choosing another path to boost and disabling OpenMP would look like::
 
 	cmake "-DBOOST_ROOT=/path/to/boost" "-DENABLE_OPENMP=OFF" ../
 
-An introduction on how to run cmake can be found `here <http://cmake.org/runningcmake/>`_.
+An introduction on how to run cmake can be found `here <http://cmake.org/runningcmake/>`__.
+
+
+Windows and Visual Studio
+**********************************************************
+
+Dependencies
+---------------------------------
+
+First start by download and installing:
+
+* `CMake <https://cmake.org/download/>`__
+* The most recent `boost binaries <http://sourceforge.net/projects/boost/files/boost-binaries/>`__
+
+Setting Up Boost
+----------------------------------
+
+
+For simplicity, we assume that you installed boost in ``C:\locale\boost_1.59\``.
+The boost libraries will be located in a subfolder whose name depends on your compiler (e.g.
+``C:\locale\boost_1.59\lib64-msvc-12.0``). Next, you need to tell Windows
+about the location of the binaries as otherwise compilation will work, but running the compiled binaries
+will not be possible. 
+
+For this you go to
+My Computer>Properties>Advanced>Environment Variables>System Variables>Path>Edit>Variable Value
+and add ``;C:\locale\boost_1.59\lib64-msvc-12.0`` (or your equivalent path) to the end.
+
+Installing Shark
+-----------------------
+
+* Download the sources from our :doc:`Downloads page <../downloads/downloads>` and unpack them
+* Open the CMake GUI
+* Next to "Where is the source code" set the path to the unpacked Shark location
+* Next to "Where to build the directory" set the path to where you want the Visual Studio project files to be
+* Click on "Add Entry"
+* Add an Entry BOOST_ROOT of type PATH and set it to your boost intall directory (e.g. ``C:\locale\boost_1.59``)
+* Add an Entry BOOST_LIBRARYDIR of type PATH and set it to your boost library directory (e.g. ``C:\locale\boost_1.59\lib64-msvc-12.0``)
+* Set the right Visual Studio compiler and click on Configure (possibly twice) and then on generate

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/shark.git