Virtualization
/
jansson
mirror of https://github.com/akheron/jansson
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed some minor issues.

This commit is contained in:
Joakim Soderberg 2013-04-25 13:59:26 +00:00
parent 8390c90a91
commit 0687442f5d
2 changed files with 6 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
cmake/FindSphinx.cmake
View File

@ -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"). # PART B. DOWNLOADING AGREEMENT - LICENSE FROM SBIA WITH RIGHT TO SUBLICENSE ("SOFTWARE LICENSE").
# ------------------------------------------------------------------------------------------------ # ------------------------------------------------------------------------------------------------

12
doc/gettingstarted.rst
View File

@ -73,7 +73,7 @@ See the examples below for more detailed information.
.. _build-cmake-unix: .. _build-cmake-unix:
Unix (Make files) Unix (Make files)
................. ^^^^^^^^^^^^^^^^^
Generating make files on unix: Generating make files on unix:
.. parsed-literal:: .. parsed-literal::
@ -92,7 +92,7 @@ Then to build::
make install make install
Windows (Visual Studio) Windows (Visual Studio)
....................... ^^^^^^^^^^^^^^^^^^^^^^^
Creating Visual Studio project files from the command line: Creating Visual Studio project files from the command line:
.. parsed-literal:: .. parsed-literal::
@ -123,7 +123,7 @@ for the project, run::
cmake -LH .. cmake -LH ..
Mac OSX (Xcode) Mac OSX (Xcode)
............... ^^^^^^^^^^^^^^^
If you prefer using Xcode instead of make files on OSX, If you prefer using Xcode instead of make files on OSX,
do the following. (Use the same steps as do the following. (Use the same steps as
for :ref:`Unix <build-cmake-unix>`):: for :ref:`Unix <build-cmake-unix>`)::
@ -132,10 +132,10 @@ for :ref:`Unix <build-cmake-unix>`)::
cmake -G "Xcode" .. cmake -G "Xcode" ..
Additional CMake settings Additional CMake settings
......................... ^^^^^^^^^^^^^^^^^^^^^^^^^
Shared library Shared library
~~~~~~~~~~~~~~ """"""""""""""
By default the CMake_ project will generate build files for building the By default the CMake_ project will generate build files for building the
static library. To build the shared version use:: static library. To build the shared version use::
@ -143,7 +143,7 @@ static library. To build the shared version use::
cmake -DBUILD_SHARED=1 .. cmake -DBUILD_SHARED=1 ..
Changing install directory (same as autoconf --prefix) Changing install directory (same as autoconf --prefix)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ """"""""""""""""""""""""""""""""""""""""""""""""""""""
Just as with the autoconf_ project you can change the destination directory Just as with the autoconf_ project you can change the destination directory
for ``make install``. The equivalent for autoconfs ``./configure --prefix`` for ``make install``. The equivalent for autoconfs ``./configure --prefix``
in CMake_ is:: in CMake_ is::