diff --git a/Installation/doc_tex/Installation/installation.tex b/Installation/doc_tex/Installation/installation.tex index 3476d6644ba..7b527f778b1 100644 --- a/Installation/doc_tex/Installation/installation.tex +++ b/Installation/doc_tex/Installation/installation.tex @@ -68,11 +68,11 @@ This document describes how to install \cgal\ on Windows, Unix-like systems and Ideally, installing \cgal amounts to: \begin{verbatim} - cd CGAL-3.6 # go to CGAL directory + cd CGAL-3.7 # go to CGAL directory cmake . # configure CGAL make # build the CGAL libraries cd examples/Straight_skeleton_2 # go to an example directory - cmake -DCGAL_DIR=$HOME/CGAL-3.6 . # configure the examples + cmake -DCGAL_DIR=$HOME/CGAL-3.7 . # configure the examples make # build the examples \end{verbatim} %% $ This dollar is there to trick syntax highlighting in emacs @@ -89,7 +89,7 @@ e.g. for numeric solvers, or visualization. \subsection{Compilers} In order to build the \cgal\ libraries, you need a \CC\ compiler. -\cgal~3.6 is supported for the following compilers/operating systems: +\cgal~3.7 is supported for the following compilers/operating systems: \begin{center}\index{compilers!supported}\index{supported compilers} \renewcommand{\arraystretch}{1.3} @@ -185,16 +185,16 @@ on univariate polynomials. It can be downloaded from \rspage. The \cgal\ library can be downloaded from \path'http://www.cgal.org/download.html'. -After you have downloaded the file \texttt{CGAL-3.6.tar.gz} containing the +After you have downloaded the file \texttt{CGAL-3.7.tar.gz} containing the \cgal\ sources, you have to unpack it. Under a Unix-like shell, use the command: \begin{verbatim} - tar xzf CGAL-3.6.tar.gz + tar xzf CGAL-3.7.tar.gz \end{verbatim} -When you are on Windows you may download and run the \texttt{CGAL-3.6-Setup.exe}. It is a +When you are on Windows you may download and run the \texttt{CGAL-3.7-Setup.exe}. It is a self extracting executable that installs the \cgal\ source, and that allows you to select and download some precompiled third party libraries. @@ -240,7 +240,7 @@ third-party libraries you want to use and where they can be found, and which \cgal\ libraries you want to build. Gathering all this information is called {\em configuration}. -For CGAL-3.6, the configuration is generated with \cmake, a +For CGAL-3.7, the configuration is generated with \cmake, a cross-platform build system. This manual explains only those features of \cmake\ which are needed in order to build \cgal. Please refer to the \cmake\ documentation at \cmakepage\ for further details. @@ -257,7 +257,7 @@ argument the root directory of \cgal. For example: {\ccTexHtml{\scriptsize}{} \begin{verbatim} - cd CGAL-3.6 + cd CGAL-3.7 cmake-gui . # Notice the dot to indicate the current directory. \end{verbatim} } @@ -285,7 +285,7 @@ Alternatively, you can run the command-line tool called {\ccTexHtml{\scriptsize}{} \begin{verbatim} - cd CGAL-3.6 + cd CGAL-3.7 cmake . # Notice the dot to indicate the current directory. \end{verbatim} } @@ -317,7 +317,7 @@ build files). For example, the following generates solution files for use in Vis {\ccTexHtml{\scriptsize}{} \begin{verbatim} - cd CGAL-3.6 + cd CGAL-3.7 cmake -G"Visual Studio 9 2008" . \end{verbatim} } @@ -329,7 +329,7 @@ specify the desired compiler in the call to \cmake{}, as in this example: {\ccTexHtml{\scriptsize}{} \begin{verbatim} - cd CGAL-3.6 + cd CGAL-3.7 cmake -DCMAKE_CXX_COMPILER:FILEPATH=g++-3.4 . \end{verbatim} } @@ -383,7 +383,7 @@ If you turn off the configuration of a library, you can still configure it manua {\ccTexHtml{\scriptsize}{} \begin{verbatim} - cd CGAL-3.6/src/CGALQt4 + cd CGAL-3.7/src/CGALQt4 cmake . # configures only the CGAL_Qt4 library \end{verbatim} } @@ -436,12 +436,12 @@ You can, for example, generate subdirectories \cgaldir{}\texttt{/cmake/platforms {\ccTexHtml{\scriptsize}{} \begin{verbatim} -mkdir CGAL-3.6/cmake/platforms/debug -cd CGAL-3.6/cmake/platforms/debug +mkdir CGAL-3.7/cmake/platforms/debug +cd CGAL-3.7/cmake/platforms/debug cmake -DCMAKE_BUILD_TYPE=Debug ../../.. -mkdir CGAL-3.6/cmake/platforms/release -cd CGAL-3.6/cmake/platforms/release +mkdir CGAL-3.7/cmake/platforms/release +cd CGAL-3.7/cmake/platforms/release cmake -DCMAKE_BUILD_TYPE=Release ../../.. \end{verbatim} } @@ -462,7 +462,7 @@ succeeding build step as follows: {\ccTexHtml{\scriptsize}{} \begin{verbatim} -cd CGAL-3.6 +cd CGAL-3.7 # build all the selected libraries at once @@ -560,7 +560,7 @@ installation in a {\sc Unix}-like environment: {\ccTexHtml{\scriptsize}{} \begin{verbatim} -cd CGAL-3.6 +cd CGAL-3.7 cmake . # configure make # compile @@ -582,7 +582,7 @@ variable explicitly {\em at the configuration time} and not when executing the i \end{ccAdvanced} The file \texttt{CGALConfig.cmake} is installed by default in -\texttt{\$CMAKE\_INSTALLED\_PREFIX/lib/CGAL-3.6}. +\texttt{\$CMAKE\_INSTALLED\_PREFIX/lib/CGAL-3.7}. \section{Configuring and Building Programs Using \cgal} @@ -601,8 +601,8 @@ to indicate the location of that config file in the \cmake\ variable {\ccTexHtml{\scriptsize}{} \begin{verbatim} -cd CGAL-3.6/examples/Straight_skeleton_2 -cmake -DCGAL_DIR=$HOME/CGAL-3.6 . +cd CGAL-3.7/examples/Straight_skeleton_2 +cmake -DCGAL_DIR=$HOME/CGAL-3.7 . make \end{verbatim} @@ -642,13 +642,13 @@ controlling variable right up front: {\ccTexHtml{\scriptsize}{} \begin{verbatim} -cd CGAL-3.6 +cd CGAL-3.7 cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS=-g . -cd CGAL-3.6/examples/Straight_skeleton_2 +cd CGAL-3.7/examples/Straight_skeleton_2 -cmake -DCGAL_DIR=CGAL-3.6 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS=-O2 -DCGAL_DONT_OVERRIDE_CMAKE_FLAGS=TRUE . +cmake -DCGAL_DIR=CGAL-3.7 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS=-O2 -DCGAL_DONT_OVERRIDE_CMAKE_FLAGS=TRUE . \end{verbatim} } @@ -1149,7 +1149,7 @@ cmake -DWITH_examples=false -- uic executable: C:/Work/Downloaded/Libraries/qt-win-opensource-src-4.4.1/bin/uic.exe -- Configuring done -- Generating done --- Build files have been written to: C:/Work/Active/GeometryFactory/CGAL/Autotest/CGAL-3.6/cmake/platforms/a +-- Build files have been written to: C:/Work/Active/GeometryFactory/CGAL/Autotest/CGAL-3.7/cmake/platforms/a \end{verbatim} }