From 0687442f5dcdc612deb381e332f758fb9ff0fd24 Mon Sep 17 00:00:00 2001 From: Joakim Soderberg Date: Thu, 25 Apr 2013 13:59:26 +0000 Subject: [PATCH] Fixed some minor issues. --- cmake/FindSphinx.cmake | 40 ---------------------------------------- doc/gettingstarted.rst | 12 ++++++------ 2 files changed, 6 insertions(+), 46 deletions(-) diff --git a/cmake/FindSphinx.cmake b/cmake/FindSphinx.cmake index aefdcd0..6eac499 100644 --- a/cmake/FindSphinx.cmake +++ b/cmake/FindSphinx.cmake @@ -1,43 +1,3 @@ -#find_program(SPHINX_EXECUTABLE NAMES sphinx-build -# HINTS -# $ENV{SPHINX_DIR} -# PATH_SUFFIXES bin -# DOC "Sphinx documentation generator" -#) -# -#include(FindPackageHandleStandardArgs) -# -## Get the version. -#execute_process( -# COMMAND "${SPHINX_EXECUTABLE} -h" -# OUTPUT_VARIABLE _SPHINX_VERSION_STRING -# ERROR_VARIABLE _SPHINX_VERSION_STRING) -# -#message("Sp ${_SPHINX_VERSION_STRING}") -#if (_SPHINX_VERSION_STRING MATCHES "Sphinx v([0-9]+\\.[0-9]+\\.[0-9]+)") -# set(SPHINX_VERSION_STRING "${CMAKE_MATCH_1}") -# string (REPLACE "." ";" _SPHINX_VERSION "${SPHINX_VERSION_STRING}") -# list(GET _SPHINX_VERSION 0 SPHINX_VERSION_MAJOR) -# list(GET _SPHINX_VERSION 1 SPHINX_VERSION_MINOR) -# list(GET _SPHINX_VERSION 2 SPHINX_VERSION_PATCH) -# if (SPHINX_VERSION_PATCH EQUAL 0) -# string (REGEX REPLACE "\\.0$" "" SPHINX_VERSION_STRING "${SPHINX_VERSION_STRING}") -# endif () -#endif() -# -#find_package_handle_standard_args(Sphinx DEFAULT_MSG -# SPHINX_EXECUTABLE -# VERSION_VAR -# SPHINX_VERSION_STRING -#) -# -#mark_as_advanced( -# SPHINX_EXECUTABLE -# SPHINX_VERSION_STRING -#) -# -#unset(_SPHINX_VERSION_STRING) - # # PART B. DOWNLOADING AGREEMENT - LICENSE FROM SBIA WITH RIGHT TO SUBLICENSE ("SOFTWARE LICENSE"). # ------------------------------------------------------------------------------------------------ diff --git a/doc/gettingstarted.rst b/doc/gettingstarted.rst index 0e008cd..4e59e51 100644 --- a/doc/gettingstarted.rst +++ b/doc/gettingstarted.rst @@ -73,7 +73,7 @@ See the examples below for more detailed information. .. _build-cmake-unix: Unix (Make files) -................. +^^^^^^^^^^^^^^^^^ Generating make files on unix: .. parsed-literal:: @@ -92,7 +92,7 @@ Then to build:: make install Windows (Visual Studio) -....................... +^^^^^^^^^^^^^^^^^^^^^^^ Creating Visual Studio project files from the command line: .. parsed-literal:: @@ -123,7 +123,7 @@ for the project, run:: cmake -LH .. Mac OSX (Xcode) -............... +^^^^^^^^^^^^^^^ If you prefer using Xcode instead of make files on OSX, do the following. (Use the same steps as for :ref:`Unix `):: @@ -132,10 +132,10 @@ for :ref:`Unix `):: cmake -G "Xcode" .. Additional CMake settings -......................... +^^^^^^^^^^^^^^^^^^^^^^^^^ Shared library -~~~~~~~~~~~~~~ +"""""""""""""" By default the CMake_ project will generate build files for building the static library. To build the shared version use:: @@ -143,7 +143,7 @@ static library. To build the shared version use:: cmake -DBUILD_SHARED=1 .. Changing install directory (same as autoconf --prefix) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +"""""""""""""""""""""""""""""""""""""""""""""""""""""" Just as with the autoconf_ project you can change the destination directory for ``make install``. The equivalent for autoconfs ``./configure --prefix`` in CMake_ is::