files got not staged for whatever reason at the last time

CMakeLists.txt

@@ -81,7 +81,7 @@ ELSE(SHARE_DIR)
   MESSAGE(FATAL_ERROR "pg_config --sharedir failed to return a value. Please check your PostgreSQL installation!")
 ENDIF(SHARE_DIR)
 
-
+OPTION(WITH_DOC "Build Documentation" OFF)
 OPTION(WITH_TSP "Build TSP library" OFF)
 OPTION(WITH_DD "Build Driving distance library" OFF)
 
@@ -158,6 +158,10 @@ IF(APPLE)
         LINK_FLAGS "-bundle_loader ${POSTGRESQL_EXECUTABLE} -bundle")
 ENDIF(APPLE)
 
+IF(WITH_DOC)
+  ADD_SUBDIRECTORY(doc)
+ENDIF(WITH_DOC)
+
 IF(WITH_TSP)
   macro_optional_find_package(GAUL)
   IF(NOT GAUL_FOUND)

README.md

@@ -32,14 +32,18 @@ http://www.pgrouting.org/docs/1.x/install.html
 
 For MinGW on Windows
 
-	cmake -H. -Bmybuild -G"MSYS Makefiles" -DWITH_TSP=ON -DWITH_DD=ON .
+	cmake -H. -Bmybuild -G"MSYS Makefiles" -DWITH_TSP=ON -DWITH_DD=ON 
 
 For Linux
 
-	cmake -H. -Bmybuild -DWITH_TSP=ON -DWITH_DD=ON .
+	cmake -H. -Bmybuild -DWITH_TSP=ON -DWITH_DD=ON 
 	cd mybuild && make
 	sudo make install
 
+Build with documentation (requires Sphinx)
+
+	cmake -H. -Bmybuild -DWITH_DOC=ON -DWITH_TSP=ON -DWITH_DD=ON
+
 Postgresql 9.1+
 
 	createdb mydatabase

doc/CMakeLists.txt

@@ -1,9 +1,12 @@
-#
-#
-#
+# 
+# Find Sphinx
+# Find Sphinx executable to build documentation
+# Source: http://ericscottbarr.com/blog/2012/03/sphinx-and-cmake-beautiful-documentation-for-c-projects/
+# 
+# Daniel Kastl 03/2013
 #
 
-find_package(Sphinx REQUIRED)
+FIND_PACKAGE(Sphinx REQUIRED)
 
 if(NOT DEFINED SPHINX_THEME)
     set(SPHINX_THEME default)
@@ -14,20 +17,20 @@ if(NOT DEFINED SPHINX_THEME_DIR)
 endif()
 
 # configured documentation tools and intermediate build results
-set(BINARY_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/_build")
+set(BINARY_BUILD_DIR "${CMAKE_BINARY_DIR}/doc/_build")
 
 # Sphinx cache with pickled ReST documents
-set(SPHINX_CACHE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_doctrees")
+set(SPHINX_CACHE_DIR "${CMAKE_BINARY_DIR}/doc/_doctrees")
 
 # HTML output directory
-set(SPHINX_HTML_DIR "${CMAKE_CURRENT_BINARY_DIR}/html")
+set(SPHINX_HTML_DIR "${PGROUTING_SOURCE_DIR}/lib/html")
 
 configure_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in"
     "${BINARY_BUILD_DIR}/conf.py"
     @ONLY)
 
-add_custom_target(my_project_docs ALL
+add_custom_target(pgRoutingDocumentationdoc ALL
     ${SPHINX_EXECUTABLE}
     -q -b html
     -c "${BINARY_BUILD_DIR}"

doc/README.rst

@@ -105,7 +105,7 @@ probably get someone to setup travis-ci or jenkins testing frameworks.
 Currently all the tests work off a simple graph that was built for
 testing trsp functionality.
 
-.. image:: build/trsp-test-image.png
+.. image:: ../build/trsp-test-image.png
 
 Tests are run via the script at the top level test-runner.pl and it runs
 all the test configured tests and at the moment just dumps the results

doc/index.rst

@@ -12,7 +12,6 @@ Contents:
    :maxdepth: 2
 
    README
-   ...
 
 
 Indices and tables